@react-native-ohos/react-native-keyboard-controller 1.12.8-rc.7 → 1.12.9

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

@@ -1,74 +1,147 @@
-/*
- * Copyright (c) 2024 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.
- */
-
-#ifndef KEYBOARDCONTROLLERVIEWCOMPONENTINSTANCE_H
-#define KEYBOARDCONTROLLERVIEWCOMPONENTINSTANCE_H
-
-#ifndef TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_KEYBOARDCONTROLLERVIEWCOMPONENTINSTANCE_H
-#define TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_KEYBOARDCONTROLLERVIEWCOMPONENTINSTANCE_H
-
-#include <any>
-#include "RNOH/CppComponentInstance.h"
-#include "KeyboardControllerViewComponentDescriptor.h"
-#include "RNOHCorePackage/ComponentInstances/TextInputComponentInstance.h"
-#include "RNOH/arkui/CustomNode.h"
-#include "RNOH/ArkTSMessageHub.h"
-#include "RNOH/arkui/TextInputNode.h"
-#include "RNOH/arkui/TextAreaNode.h"
-
-namespace rnoh {
-enum KeyboardControllerStatus { HIDE = 0, SHOW = 1 };
-class KeyboardControllerViewComponentInstance
-    : public CppComponentInstance<facebook::react::KeyboardControllerViewShadowNode>,
-      public CustomNodeDelegate,
-      public TextAreaNodeDelegate,
-      public TextInputNodeDelegate,
-      public ArkTSMessageHub::Observer {
-public:
-    KeyboardControllerViewComponentInstance(Context context);
-    void onKeyboardMoveStart();
-    void onKeyboardMove();
-    void onKeyboardMoveEnd();
-    void onKeyboardMoveInteractive();
-    void onFocusedInputLayoutChanged();
-    void onFocusedInputTextChanged();
-    void onFocusedInputSelectionChanged();
-
-    void onChildInserted(ComponentInstance::Shared const &childComponentInstance, std::size_t index) override;
-    void onChildRemoved(ComponentInstance::Shared const &childComponentInstance) override;
-    void onPropsChanged(SharedConcreteProps const &props) override;
-    void onCommandReceived(std::string const &commandName, folly::dynamic const &args) override;
-    void onMessageReceived(ArkTSMessage const &message) override;
-    ArkUINode &getLocalRootArkUINode() override;
-    void onClick() override;
-    // textArea textInput delegate
-    void onChange(std::string text) override;
-    void onBlur() override;
-    void onFocus() override;
-    void onTextSelectionChange(int32_t location, int32_t length) override;
-
-protected:
-private:
-    bool enabled;
-    bool statusBarTranslucent;
-    bool navigationBarTranslucent;
-    double keyboardHeight;
-    std::map<std::string, std::any> dictionary;
-    int keyboardStatus;
-    std::vector<TextInputComponentInstance::Shared> textInputVector{};
-    CustomNode m_customNode{};
-    ComponentInstance::Shared currentResponder;
-    void findTextInputComponents(ComponentInstance::Shared const &parentComponentInstance);
-    void setWindowSystemBarEnable();
-    void startKeyboardObserver();
-    void closeKeyboardObserver();
-    void keyboardHeightChangeHandle();
-};
-} // namespace rnoh
-
-#endif
-
-#endif
+/*
+ * Copyright (c) 2024 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.
+ */
+
+#ifndef KEYBOARDCONTROLLERVIEWCOMPONENTINSTANCE_H
+#define KEYBOARDCONTROLLERVIEWCOMPONENTINSTANCE_H
+
+#ifndef TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_KEYBOARDCONTROLLERVIEWCOMPONENTINSTANCE_H
+#define TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_KEYBOARDCONTROLLERVIEWCOMPONENTINSTANCE_H
+
+#include <any>
+#include <optional>
+#include "RNOH/CppComponentInstance.h"
+#include "RNOH/TaskExecutor/TaskExecutor.h"
+#include "RNOH/VSyncListener.h"
+#include "KeyboardControllerViewComponentDescriptor.h"
+#include "RNOHCorePackage/ComponentInstances/TextInputComponentInstance.h"
+#include "RNOH/arkui/CustomNode.h"
+#include "RNOH/ArkTSMessageHub.h"
+#include "RNOH/arkui/TextInputNode.h"
+#include "RNOH/arkui/TextAreaNode.h"
+#include "ViewHierarchyNavigator.h"
+#include "RNOH/arkui/NativeNodeApi.h"
+#include <arkui/native_node.h>
+#include <arkui/native_type.h>
+
+namespace rnoh {
+struct FocusedInputLayoutData {
+    int target = -1;
+    int parentScrollViewTarget = -1;
+    double absoluteX = 0;
+    double absoluteY = 0;
+    double x = 0;
+    double y = 0;
+    double width = 0;
+    double height = 0;
+
+    bool operator==(FocusedInputLayoutData const &other) const {
+        return target == other.target &&
+               parentScrollViewTarget == other.parentScrollViewTarget &&
+               absoluteX == other.absoluteX &&
+               absoluteY == other.absoluteY &&
+               x == other.x &&
+               y == other.y &&
+               width == other.width &&
+               height == other.height;
+    }
+};
+
+enum KeyboardControllerStatus { HIDE = 0, SHOW = 1 };
+class KeyboardControllerViewComponentInstance
+    : public CppComponentInstance<facebook::react::KeyboardControllerViewShadowNode>,
+      public CustomNodeDelegate,
+      public TextAreaNodeDelegate,
+      public TextInputNodeDelegate,
+      public ArkTSMessageHub::Observer {
+public:
+    KeyboardControllerViewComponentInstance(Context context);
+    ~KeyboardControllerViewComponentInstance() override;
+    void onKeyboardMoveStart();
+    void onKeyboardMove();
+    void onKeyboardMoveEnd();
+    void onKeyboardMoveInteractive();
+    void onFocusedInputLayoutChanged();
+    void onFocusedInputTextChanged();
+    void onFocusedInputSelectionChanged();
+
+    void onChildInserted(ComponentInstance::Shared const &childComponentInstance, std::size_t index) override;
+    void onChildRemoved(ComponentInstance::Shared const &childComponentInstance) override;
+    void onPropsChanged(SharedConcreteProps const &props) override;
+    void onCommandReceived(std::string const &commandName, folly::dynamic const &args) override;
+    void onMessageReceived(ArkTSMessage const &message) override;
+    ArkUINode &getLocalRootArkUINode() override;
+    void onClick() override;
+    // textArea textInput delegate
+    void onChange(std::string text) override;
+    void onChange(std::string text, std::string extendStr) override;
+    void onBlur() override;
+    void onFocus() override;
+    void onTextSelectionChange(int32_t location, int32_t length) override;
+
+protected:
+private:
+    bool enabled = false;
+    bool statusBarTranslucent = false;
+    bool navigationBarTranslucent = false;
+    double keyboardHeight = 0;
+    std::map<std::string, std::any> dictionary;
+    int keyboardStatus = KeyboardControllerStatus::HIDE;
+    std::vector<TextInputComponentInstance::Shared> textInputVector{};
+    CustomNode m_customNode{};
+    ComponentInstance::Shared currentResponder;
+    void findTextInputComponents(ComponentInstance::Shared const &parentComponentInstance);
+    void clearTextInputDelegates(ComponentInstance::Shared const &parentComponentInstance);
+    void removeInputObserver(ArkUI_NodeHandle handle);
+    void onChange(std::string text, TextInputComponentInstance::Shared const &focusedInput);
+    void setWindowSystemBarEnable();
+    void startKeyboardObserver();
+    void closeKeyboardObserver();
+    void keyboardHeightChangeHandle(double previousKeyboardHeight);
+    void setFocusTo(const std::string& direction);
+    void focusDidSet();
+    void syncUpLayout();
+    void syncUpLayout(TextInputComponentInstance::Shared const &focusedInput);
+    void dispatchLayoutToJS(FocusedInputLayoutData const &event);
+    void dispatchKeyboardFocusChangedIfNeeded(TextInputComponentInstance::Shared const &focusedInput);
+    TextInputComponentInstance::Shared findFocusedTextInput();
+    // Harmony does not expose selection start/end geometry; x/y are reported as 0.
+    void dispatchSelectionToJS(int target, int32_t startPos, int32_t endPos);
+    void postFocusedInputChanged();
+    int findParentScrollViewTarget(ComponentInstance::Shared const &input);
+    double pxToVp(double px) const;
+    void updateFocusedInputLayoutObserver(TextInputComponentInstance::Shared const &focusedInput);
+    void clearFocusedInputLayoutObserver();
+    static void textSelectionEventReceiver(ArkUI_NodeEvent *event);
+    TaskExecutor::Shared getTaskExecutor() const;
+    void cancelKeyboardAnimation();
+    void startKeyboardAnimation(double fromHeight, double toHeight, int target);
+    void requestKeyboardAnimationFrame(
+        uint64_t generation,
+        double fromHeight,
+        double toHeight,
+        int target);
+    void handleKeyboardAnimationFrame(
+        uint64_t generation,
+        double fromHeight,
+        double toHeight,
+        int target,
+        int64_t timestampNs);
+    FocusedInputLayoutData m_lastLayoutEvent;
+    int m_lastKeyboardEventTarget = -1;
+    bool m_isHandlingKeyboardHeightChange = false;
+    ArkUI_NodeHandle m_observedFocusedInputHandle = nullptr;
+    std::optional<TaskExecutor::DelayedTask> m_keyboardAnimationTask;
+    std::shared_ptr<VSyncListener> m_keyboardVsyncListener;
+    std::optional<int64_t> m_keyboardAnimationStartTimestampNs;
+    uint64_t m_keyboardAnimationGeneration = 0;
+    void *high_lib_handle = NULL;
+    ArkUI_ErrorCode (*focusRequestMethod)(ArkUI_NodeHandle node);
+};
+} // namespace rnoh
+
+#endif
+
+#endif

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

@@ -1,43 +1,43 @@
-/*
- * Copyright (c) 2024 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.
- */
-
-#ifndef TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_KEYBOARDCONTROLLERVIEWJSIBINDER_H
-#define TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_KEYBOARDCONTROLLERVIEWJSIBINDER_H
-
-#pragma once
-#include "RNOHCorePackage/ComponentBinders/ViewComponentJSIBinder.h"
-namespace rnoh {
-class KeyboardControllerViewJSIBinder : public ViewComponentJSIBinder {
-protected:
-    facebook::jsi::Object createNativeProps(facebook::jsi::Runtime &rt) override {
-        auto object = ViewComponentJSIBinder::createNativeProps(rt);
-        object.setProperty(rt, "enabled", "bool");
-        object.setProperty(rt, "statusBarTranslucent", "bool");
-        object.setProperty(rt, "navigationBarTranslucent", "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);
-        events.setProperty(rt, "topKeyboardMoveStart", createDirectEvent(rt, "onKeyboardMoveStart"));
-        events.setProperty(rt, "topKeyboardMove", createDirectEvent(rt, "onKeyboardMove"));
-        events.setProperty(rt, "topKeyboardMoveEnd", createDirectEvent(rt, "onKeyboardMoveEnd"));
-        events.setProperty(rt, "topKeyboardMoveInteractive", createDirectEvent(rt, "onKeyboardMoveInteractive"));
-        events.setProperty(rt, "topFocusedInputLayoutChanged", createDirectEvent(rt, "onFocusedInputLayoutChanged"));
-        events.setProperty(rt, "topFocusedInputTextChanged", createDirectEvent(rt, "onFocusedInputTextChanged"));
-        events.setProperty(rt, "topFocusedInputSelectionChanged",
-                           createDirectEvent(rt, "onFocusedInputSelectionChanged"));
-        return events;
-    }
-};
-} // namespace rnoh
-
-#endif
+/*
+ * Copyright (c) 2024 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.
+ */
+
+#ifndef TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_KEYBOARDCONTROLLERVIEWJSIBINDER_H
+#define TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_KEYBOARDCONTROLLERVIEWJSIBINDER_H
+
+#pragma once
+#include "RNOHCorePackage/ComponentBinders/ViewComponentJSIBinder.h"
+namespace rnoh {
+class KeyboardControllerViewJSIBinder : public ViewComponentJSIBinder {
+protected:
+    facebook::jsi::Object createNativeProps(facebook::jsi::Runtime &rt) override {
+        auto object = ViewComponentJSIBinder::createNativeProps(rt);
+        object.setProperty(rt, "enabled", "bool");
+        object.setProperty(rt, "statusBarTranslucent", "bool");
+        object.setProperty(rt, "navigationBarTranslucent", "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);
+        events.setProperty(rt, "topKeyboardMoveStart", createDirectEvent(rt, "onKeyboardMoveStart"));
+        events.setProperty(rt, "topKeyboardMove", createDirectEvent(rt, "onKeyboardMove"));
+        events.setProperty(rt, "topKeyboardMoveEnd", createDirectEvent(rt, "onKeyboardMoveEnd"));
+        events.setProperty(rt, "topKeyboardMoveInteractive", createDirectEvent(rt, "onKeyboardMoveInteractive"));
+        events.setProperty(rt, "topFocusedInputLayoutChanged", createDirectEvent(rt, "onFocusedInputLayoutChanged"));
+        events.setProperty(rt, "topFocusedInputTextChanged", createDirectEvent(rt, "onFocusedInputTextChanged"));
+        events.setProperty(rt, "topFocusedInputSelectionChanged",
+                           createDirectEvent(rt, "onFocusedInputSelectionChanged"));
+        return events;
+    }
+};
+} // namespace rnoh
+
+#endif

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

@@ -1,64 +1,64 @@
-/*
- * Copyright (c) 2024 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.
- */
- 
-#ifndef TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_KEYBOARDGESTUREAREACOMPONENTDESCRIPTOR_H
-#define TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_KEYBOARDGESTUREAREACOMPONENTDESCRIPTOR_H
-
-#ifndef KEYBOARDGESTUREAREACOMPONENTDESCRIPTOR_H
-#define KEYBOARDGESTUREAREACOMPONENTDESCRIPTOR_H
-
-
-#pragma once
-
-
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/components/view/ConcreteViewShadowNode.h>
-#include <react/renderer/components/view/ViewShadowNode.h>
-#include <react/renderer/core/propsConversions.h>
-#include "EventEmitters.h"
-
-namespace facebook {
-namespace react {
-
-inline const char KeyboardGestureAreaComponentName[] = "RNKeyboardGestureArea";
-
-class KeyboardGestureAreaProps : public ViewProps {
-public:
-    bool showOnSwipeUp;
-    bool enableSwipeToDismiss;
-    std::string interpolator;
-    KeyboardGestureAreaProps() = default;
-
-    KeyboardGestureAreaProps(const PropsParserContext &context, const KeyboardGestureAreaProps &sourceProps,
-                             const RawProps &rawProps)
-        : ViewProps(context, sourceProps, rawProps),
-          showOnSwipeUp(CoreFeatures::enablePropIteratorSetter
-                            ? sourceProps.showOnSwipeUp
-                            : convertRawProp(context, rawProps, "showOnSwipeUp", sourceProps.showOnSwipeUp, {false})),
-          enableSwipeToDismiss(CoreFeatures::enablePropIteratorSetter
-                                   ? sourceProps.enableSwipeToDismiss
-                                   : convertRawProp(context, rawProps, "enableSwipeToDismiss",
-                                                    sourceProps.enableSwipeToDismiss, {false})),
-          interpolator(CoreFeatures::enablePropIteratorSetter
-                           ? sourceProps.interpolator
-                           : convertRawProp(context, rawProps, "interpolator", sourceProps.interpolator, {"linear"})) {}
-};
-
-using KeyboardGestureAreaShadowNode =
-    ConcreteViewShadowNode<KeyboardGestureAreaComponentName, KeyboardGestureAreaProps, ViewEventEmitter>;
-
-class KeyboardGestureAreaComponentDescriptor final : public ConcreteComponentDescriptor<KeyboardGestureAreaShadowNode> {
-public:
-    KeyboardGestureAreaComponentDescriptor(ComponentDescriptorParameters const &parameters)
-        : ConcreteComponentDescriptor(parameters) {}
-};
-
-} // namespace react
-} // namespace facebook
-
-#endif
-
-#endif
+/*
+ * Copyright (c) 2024 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.
+ */
+ 
+#ifndef TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_KEYBOARDGESTUREAREACOMPONENTDESCRIPTOR_H
+#define TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_KEYBOARDGESTUREAREACOMPONENTDESCRIPTOR_H
+
+#ifndef KEYBOARDGESTUREAREACOMPONENTDESCRIPTOR_H
+#define KEYBOARDGESTUREAREACOMPONENTDESCRIPTOR_H
+
+
+#pragma once
+
+
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
+#include <react/renderer/components/view/ViewShadowNode.h>
+#include <react/renderer/core/propsConversions.h>
+#include "EventEmitters.h"
+
+namespace facebook {
+namespace react {
+
+inline const char KeyboardGestureAreaComponentName[] = "RNKeyboardGestureArea";
+
+class KeyboardGestureAreaProps : public ViewProps {
+public:
+    bool showOnSwipeUp;
+    bool enableSwipeToDismiss;
+    std::string interpolator;
+    KeyboardGestureAreaProps() = default;
+
+    KeyboardGestureAreaProps(const PropsParserContext &context, const KeyboardGestureAreaProps &sourceProps,
+                             const RawProps &rawProps)
+        : ViewProps(context, sourceProps, rawProps),
+          showOnSwipeUp(CoreFeatures::enablePropIteratorSetter
+                            ? sourceProps.showOnSwipeUp
+                            : convertRawProp(context, rawProps, "showOnSwipeUp", sourceProps.showOnSwipeUp, {false})),
+          enableSwipeToDismiss(CoreFeatures::enablePropIteratorSetter
+                                   ? sourceProps.enableSwipeToDismiss
+                                   : convertRawProp(context, rawProps, "enableSwipeToDismiss",
+                                                    sourceProps.enableSwipeToDismiss, {false})),
+          interpolator(CoreFeatures::enablePropIteratorSetter
+                           ? sourceProps.interpolator
+                           : convertRawProp(context, rawProps, "interpolator", sourceProps.interpolator, {"linear"})) {}
+};
+
+using KeyboardGestureAreaShadowNode =
+    ConcreteViewShadowNode<KeyboardGestureAreaComponentName, KeyboardGestureAreaProps, ViewEventEmitter>;
+
+class KeyboardGestureAreaComponentDescriptor final : public ConcreteComponentDescriptor<KeyboardGestureAreaShadowNode> {
+public:
+    KeyboardGestureAreaComponentDescriptor(ComponentDescriptorParameters const &parameters)
+        : ConcreteComponentDescriptor(parameters) {}
+};
+
+} // namespace react
+} // namespace facebook
+
+#endif
+
+#endif

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

@@ -1,89 +1,89 @@
-/*
- * Copyright (c) 2024 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 "KeyboardGestureAreaComponentInstance.h"
-#include <folly/dynamic.h>
-
-
-namespace rnoh {
-KeyboardGestureAreaComponentInstance::KeyboardGestureAreaComponentInstance(Context context)
-    : CppComponentInstance(std::move(context)) {
-    DLOG(INFO) << "KeyboardGestureAreaComponentInstance";
-    ArkUINodeRegistry::getInstance().registerTouchHandler(&m_stackNode, this);
-    NativeNodeApi::getInstance()->registerNodeEvent(m_stackNode.getArkUINodeHandle(), NODE_TOUCH_EVENT,
-                                                    NODE_TOUCH_EVENT, 0);
-}
-void KeyboardGestureAreaComponentInstance::onTouchEvent(ArkUI_UIInputEvent *e) {
-    auto action = OH_ArkUI_UIInputEvent_GetAction(e);
-    DLOG(INFO) << "KeyboardGestureAreaComponentInstance onTouchEvent" << action;
-    if (action == UI_TOUCH_EVENT_ACTION_DOWN) {
-        this->swipeToDismiss();
-    }
-    if (action == UI_TOUCH_EVENT_ACTION_UP) {
-        this->swipeToUp();
-    }
-}
-void KeyboardGestureAreaComponentInstance::onChildInserted(ComponentInstance::Shared const &childComponentInstance,
-                                                           std::size_t index) {
-    CppComponentInstance::onChildInserted(childComponentInstance, index);
-    m_stackNode.insertChild(childComponentInstance->getLocalRootArkUINode(), index + 1);
-}
-
-void KeyboardGestureAreaComponentInstance::onChildRemoved(ComponentInstance::Shared const &childComponentInstance) {
-    CppComponentInstance::onChildRemoved(childComponentInstance);
-    m_stackNode.removeChild(childComponentInstance->getLocalRootArkUINode());
-}
-ArkUINode &KeyboardGestureAreaComponentInstance::getLocalRootArkUINode() { return m_stackNode; }
-void KeyboardGestureAreaComponentInstance::onPropsChanged(SharedConcreteProps const &props) {
-    DLOG(INFO) << "###onPropsChanged";
-    CppComponentInstance::onPropsChanged(props);
-    this->showOnSwipeUp = props->showOnSwipeUp;
-    this->enableSwipeToDismiss = props->enableSwipeToDismiss;
-    this->interpolator = props->interpolator;
-}
-
-void KeyboardGestureAreaComponentInstance::onCommandReceived(std::string const &commandName,
-                                                             folly::dynamic const &args) {
-    CppComponentInstance::onCommandReceived(commandName, args);
-}
-
-void KeyboardGestureAreaComponentInstance::handleTouchEvent(ArkUI_UIInputEvent *e) {
-    auto action = OH_ArkUI_UIInputEvent_GetAction(e);
-    if (action == UI_TOUCH_EVENT_ACTION_DOWN) {
-        this->swipeToDismiss();
-    }
-    if (action == UI_TOUCH_EVENT_ACTION_UP) {
-        this->swipeToUp();
-    }
-}
-void KeyboardGestureAreaComponentInstance::swipeToDismiss() {
-    if (!this->enableSwipeToDismiss) {
-        return;
-    }
-    auto rnInstancePtr = this->m_deps->rnInstance.lock();
-    if (rnInstancePtr != nullptr) {
-        auto turboModule = rnInstancePtr->getTurboModule("KeyboardController");
-        auto arkTsTurboModule = std::dynamic_pointer_cast<rnoh::ArkTSTurboModule>(turboModule);
-        arkTsTurboModule->callSync("dismiss", {});
-    }
-}
-void KeyboardGestureAreaComponentInstance::swipeToUp() {
-    if (!this->showOnSwipeUp) {
-        return;
-    }
-    auto rnInstancePtr = this->m_deps->rnInstance.lock();
-    if (rnInstancePtr != nullptr) {
-        auto turboModule = rnInstancePtr->getTurboModule("KeyboardController");
-        auto arkTsTurboModule = std::dynamic_pointer_cast<rnoh::ArkTSTurboModule>(turboModule);
-        arkTsTurboModule->callSync("show", {});
-    }
-}
-void KeyboardGestureAreaComponentInstance::executeInterpolator() {
-    // to do
-}
-
-} // namespace rnoh
+/*
+ * Copyright (c) 2024 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 "KeyboardGestureAreaComponentInstance.h"
+#include <folly/dynamic.h>
+
+
+namespace rnoh {
+KeyboardGestureAreaComponentInstance::KeyboardGestureAreaComponentInstance(Context context)
+    : CppComponentInstance(std::move(context)) {
+    DLOG(INFO) << "KeyboardGestureAreaComponentInstance";
+    ArkUINodeRegistry::getInstance().registerTouchHandler(&m_stackNode, this);
+    NativeNodeApi::getInstance()->registerNodeEvent(m_stackNode.getArkUINodeHandle(), NODE_TOUCH_EVENT,
+                                                    NODE_TOUCH_EVENT, 0);
+}
+void KeyboardGestureAreaComponentInstance::onTouchEvent(ArkUI_UIInputEvent *e) {
+    auto action = OH_ArkUI_UIInputEvent_GetAction(e);
+    DLOG(INFO) << "KeyboardGestureAreaComponentInstance onTouchEvent" << action;
+    if (action == UI_TOUCH_EVENT_ACTION_DOWN) {
+        this->swipeToDismiss();
+    }
+    if (action == UI_TOUCH_EVENT_ACTION_UP) {
+        this->swipeToUp();
+    }
+}
+void KeyboardGestureAreaComponentInstance::onChildInserted(ComponentInstance::Shared const &childComponentInstance,
+                                                           std::size_t index) {
+    CppComponentInstance::onChildInserted(childComponentInstance, index);
+    m_stackNode.insertChild(childComponentInstance->getLocalRootArkUINode(), index + 1);
+}
+
+void KeyboardGestureAreaComponentInstance::onChildRemoved(ComponentInstance::Shared const &childComponentInstance) {
+    CppComponentInstance::onChildRemoved(childComponentInstance);
+    m_stackNode.removeChild(childComponentInstance->getLocalRootArkUINode());
+}
+ArkUINode &KeyboardGestureAreaComponentInstance::getLocalRootArkUINode() { return m_stackNode; }
+void KeyboardGestureAreaComponentInstance::onPropsChanged(SharedConcreteProps const &props) {
+    DLOG(INFO) << "###onPropsChanged";
+    CppComponentInstance::onPropsChanged(props);
+    this->showOnSwipeUp = props->showOnSwipeUp;
+    this->enableSwipeToDismiss = props->enableSwipeToDismiss;
+    this->interpolator = props->interpolator;
+}
+
+void KeyboardGestureAreaComponentInstance::onCommandReceived(std::string const &commandName,
+                                                             folly::dynamic const &args) {
+    CppComponentInstance::onCommandReceived(commandName, args);
+}
+
+void KeyboardGestureAreaComponentInstance::handleTouchEvent(ArkUI_UIInputEvent *e) {
+    auto action = OH_ArkUI_UIInputEvent_GetAction(e);
+    if (action == UI_TOUCH_EVENT_ACTION_DOWN) {
+        this->swipeToDismiss();
+    }
+    if (action == UI_TOUCH_EVENT_ACTION_UP) {
+        this->swipeToUp();
+    }
+}
+void KeyboardGestureAreaComponentInstance::swipeToDismiss() {
+    if (!this->enableSwipeToDismiss) {
+        return;
+    }
+    auto rnInstancePtr = this->m_deps->rnInstance.lock();
+    if (rnInstancePtr != nullptr) {
+        auto turboModule = rnInstancePtr->getTurboModule("KeyboardController");
+        auto arkTsTurboModule = std::dynamic_pointer_cast<rnoh::ArkTSTurboModule>(turboModule);
+        arkTsTurboModule->callSync("dismiss", {});
+    }
+}
+void KeyboardGestureAreaComponentInstance::swipeToUp() {
+    if (!this->showOnSwipeUp) {
+        return;
+    }
+    auto rnInstancePtr = this->m_deps->rnInstance.lock();
+    if (rnInstancePtr != nullptr) {
+        auto turboModule = rnInstancePtr->getTurboModule("KeyboardController");
+        auto arkTsTurboModule = std::dynamic_pointer_cast<rnoh::ArkTSTurboModule>(turboModule);
+        arkTsTurboModule->callSync("show", {});
+    }
+}
+void KeyboardGestureAreaComponentInstance::executeInterpolator() {
+    // to do
+}
+
+} // namespace rnoh
 // namespace rnoh