@react-native-ohos/react-native-keyboard-controller 1.12.8 → 1.12.10-rc.1

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

@@ -1,64 +1,43 @@
-/*
- * Copyright (c) Huawei Technologies Co., Ltd. 2020-2020. All rights reserved.
- */
-/**
- * MIT License
- *
- * Copyright (C) 2024 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.
- */
- 
-#include "RNKeyboardControllerPackage.h"
-#include "KeyboardControllerViewJSIBinder.h"
-#include "KeyboardGestureAreaJSIBinder.h"
-
-
-using namespace facebook;
-using namespace rnoh;
-
-std::vector<facebook::react::ComponentDescriptorProvider>
-RNKeyboardControllerPackage::createComponentDescriptorProviders() {
-    return {facebook::react::concreteComponentDescriptorProvider<
-                facebook::react::KeyboardControllerViewComponentDescriptor>(),
-            facebook::react::concreteComponentDescriptorProvider<
-                facebook::react::KeyboardGestureAreaComponentDescriptor>()};
-}
-ComponentJSIBinderByString RNKeyboardControllerPackage::createComponentJSIBinderByName() {
-    return {{"RNKeyboardControllerView", std::make_shared<KeyboardControllerViewJSIBinder>()},
-            {"RNKeyboardGestureArea", std::make_shared<KeyboardGestureAreaJSIBinder>()}};
-}
-
-std::unique_ptr<TurboModuleFactoryDelegate> RNKeyboardControllerPackage::createTurboModuleFactoryDelegate() {
-    return std::make_unique<KeyboardControllerTurboModuleFactoryDelegate>();
-}
-
-ComponentInstanceFactoryDelegate::Shared RNKeyboardControllerPackage::createComponentInstanceFactoryDelegate() {
-    return std::make_shared<KeyboardControllerComponentInstanceFactoryDelegate>();
-};
-
-ComponentInstance::Shared RNKeyboardControllerPackage::createComponentInstance(const ComponentInstance::Context &ctx) {
-    if (ctx.componentName == "RNKeyboardControllerView") {
-        return std::make_shared<KeyboardControllerViewComponentInstance>(ctx);
-    }
-    if (ctx.componentName == "RNKeyboardGestureArea") {
-        return std::make_shared<KeyboardGestureAreaComponentInstance>(ctx);
-    }
-    return nullptr;
-};
+/*
+ * 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 "RNKeyboardControllerPackage.h"
+#include "KeyboardControllerViewJSIBinder.h"
+#include "KeyboardGestureAreaJSIBinder.h"
+
+
+using namespace facebook;
+using namespace rnoh;
+
+std::vector<facebook::react::ComponentDescriptorProvider>
+RNKeyboardControllerPackage::createComponentDescriptorProviders() {
+    return {facebook::react::concreteComponentDescriptorProvider<
+                facebook::react::KeyboardControllerViewComponentDescriptor>(),
+            facebook::react::concreteComponentDescriptorProvider<
+                facebook::react::KeyboardGestureAreaComponentDescriptor>()};
+}
+ComponentJSIBinderByString RNKeyboardControllerPackage::createComponentJSIBinderByName() {
+    return {{"RNKeyboardControllerView", std::make_shared<KeyboardControllerViewJSIBinder>()},
+            {"RNKeyboardGestureArea", std::make_shared<KeyboardGestureAreaJSIBinder>()}};
+}
+
+std::unique_ptr<TurboModuleFactoryDelegate> RNKeyboardControllerPackage::createTurboModuleFactoryDelegate() {
+    return std::make_unique<KeyboardControllerTurboModuleFactoryDelegate>();
+}
+
+ComponentInstanceFactoryDelegate::Shared RNKeyboardControllerPackage::createComponentInstanceFactoryDelegate() {
+    return std::make_shared<KeyboardControllerComponentInstanceFactoryDelegate>();
+};
+
+ComponentInstance::Shared RNKeyboardControllerPackage::createComponentInstance(const ComponentInstance::Context &ctx) {
+    if (ctx.componentName == "RNKeyboardControllerView") {
+        return std::make_shared<KeyboardControllerViewComponentInstance>(ctx);
+    }
+    if (ctx.componentName == "RNKeyboardGestureArea") {
+        return std::make_shared<KeyboardGestureAreaComponentInstance>(ctx);
+    }
+    return nullptr;
+};

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

@@ -1,77 +1,56 @@
-/*
- * Copyright (c) Huawei Technologies Co., Ltd. 2020-2020. All rights reserved.
- */
-/**
- * MIT License
- *
- * Copyright (C) 2024 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 TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_RNKEYBOARDCONTROLLERPACKAGE_H
-#define TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_RNKEYBOARDCONTROLLERPACKAGE_H
-
-#ifndef RNKEYBOARDCONTROLLERPACKAGE_H
-#define RNKEYBOARDCONTROLLERPACKAGE_H
-
-#include "KeyboardGestureAreaComponentInstance.h"
-#include "RNOH/Package.h"
-#include "RNKeyboardController.h"
-#include "RNStatusBarManagerCompat.h"
-#include "KeyboardControllerViewComponentInstance.h"
-namespace rnoh {
- class KeyboardControllerComponentInstanceFactoryDelegate : public ComponentInstanceFactoryDelegate {
- public:
-        ComponentInstance::Shared create(ComponentInstance::Context ctx) override {
-            if (ctx.componentName == "RNKeyboardControllerView") {
-                return std::make_shared<KeyboardControllerViewComponentInstance>(ctx);
-            }
-         if (ctx.componentName == "RNKeyboardGestureArea") {
-                return std::make_shared<KeyboardGestureAreaComponentInstance>(ctx);
-            }
-            return nullptr;
-        }
-    };
-class KeyboardControllerTurboModuleFactoryDelegate : public TurboModuleFactoryDelegate {
-public:
-    SharedTurboModule createTurboModule(Context ctx, const std::string &name) const override {
-        if (name == "KeyboardController") {
-            return std::make_shared<KeyboardController>(ctx, name);
-        }
-          if (name == "StatusBarManagerCompat") {
-            return std::make_shared<StatusBarManagerCompat>(ctx, name);
-        }
-        return nullptr;
-    };
-};
-class RNKeyboardControllerPackage : public Package{
-public:
-    RNKeyboardControllerPackage(Package::Context ctx) : Package(ctx) {}
-    std::unique_ptr<TurboModuleFactoryDelegate> createTurboModuleFactoryDelegate() override;
-    std::vector<facebook::react::ComponentDescriptorProvider> createComponentDescriptorProviders() override;
-    ComponentJSIBinderByString createComponentJSIBinderByName() override;
-    ComponentInstance::Shared createComponentInstance(const ComponentInstance::Context &ctx) override;
-    ComponentInstanceFactoryDelegate::Shared createComponentInstanceFactoryDelegate() override;
-};
-} // 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 TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_RNKEYBOARDCONTROLLERPACKAGE_H
+#define TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_RNKEYBOARDCONTROLLERPACKAGE_H
+
+#ifndef RNKEYBOARDCONTROLLERPACKAGE_H
+#define RNKEYBOARDCONTROLLERPACKAGE_H
+
+#include "KeyboardGestureAreaComponentInstance.h"
+#include "RNOH/Package.h"
+#include "RNKeyboardController.h"
+#include "RNStatusBarManagerCompat.h"
+#include "KeyboardControllerViewComponentInstance.h"
+namespace rnoh {
+ class KeyboardControllerComponentInstanceFactoryDelegate : public ComponentInstanceFactoryDelegate {
+ public:
+        ComponentInstance::Shared create(ComponentInstance::Context ctx) override {
+            if (ctx.componentName == "RNKeyboardControllerView") {
+                return std::make_shared<KeyboardControllerViewComponentInstance>(ctx);
+            }
+         if (ctx.componentName == "RNKeyboardGestureArea") {
+                return std::make_shared<KeyboardGestureAreaComponentInstance>(ctx);
+            }
+            return nullptr;
+        }
+    };
+class KeyboardControllerTurboModuleFactoryDelegate : public TurboModuleFactoryDelegate {
+public:
+    SharedTurboModule createTurboModule(Context ctx, const std::string &name) const override {
+        if (name == "KeyboardController") {
+            return std::make_shared<KeyboardController>(ctx, name);
+        }
+          if (name == "StatusBarManagerCompat") {
+            return std::make_shared<StatusBarManagerCompat>(ctx, name);
+        }
+        return nullptr;
+    };
+};
+class RNKeyboardControllerPackage : public Package{
+public:
+    RNKeyboardControllerPackage(Package::Context ctx) : Package(ctx) {}
+    std::unique_ptr<TurboModuleFactoryDelegate> createTurboModuleFactoryDelegate() override;
+    std::vector<facebook::react::ComponentDescriptorProvider> createComponentDescriptorProviders() override;
+    ComponentJSIBinderByString createComponentJSIBinderByName() override;
+    ComponentInstance::Shared createComponentInstance(const ComponentInstance::Context &ctx) override;
+    ComponentInstanceFactoryDelegate::Shared createComponentInstanceFactoryDelegate() override;
+};
+} // namespace rnoh
+
+#endif
+
+#endif

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

@@ -1,45 +1,24 @@
-/*
- * Copyright (c) Huawei Technologies Co., Ltd. 2020-2020. All rights reserved.
- */
-/**
- * MIT License
- *
- * Copyright (C) 2024 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.
- */
-
-
-#include "RNStatusBarManagerCompat.h"
-
-namespace rnoh {
-using namespace facebook;
-
-StatusBarManagerCompat::StatusBarManagerCompat(const ArkTSTurboModule::Context ctx, const std::string name) : ArkTSTurboModule(ctx, name)
-{
-    methodMap_ = {
-        ARK_METHOD_METADATA(getConstants, 0),
-        ARK_METHOD_METADATA(setHidden, 1),
-        ARK_METHOD_METADATA(setColor, 2),
-        ARK_METHOD_METADATA(setTranslucent, 1),
-        ARK_METHOD_METADATA(setStyle, 1),
-    };
-}
-
-} // 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 "RNStatusBarManagerCompat.h"
+
+namespace rnoh {
+using namespace facebook;
+
+StatusBarManagerCompat::StatusBarManagerCompat(const ArkTSTurboModule::Context ctx, const std::string name) : ArkTSTurboModule(ctx, name)
+{
+    methodMap_ = {
+        ARK_METHOD_METADATA(getConstants, 0),
+        ARK_METHOD_METADATA(setHidden, 1),
+        ARK_METHOD_METADATA(setColor, 2),
+        ARK_METHOD_METADATA(setTranslucent, 1),
+        ARK_METHOD_METADATA(setStyle, 1),
+    };
+}
+
+} // namespace rnoh

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

@@ -1,49 +1,28 @@
-/*
- * Copyright (c) Huawei Technologies Co., Ltd. 2020-2020. All rights reserved.
- */
-/**
- * MIT License
- *
- * Copyright (C) 2024 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 TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_RNSTATUSBARMANAGERCOMPAT_H
-#define TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_RNSTATUSBARMANAGERCOMPAT_H
-
-#ifndef RNSTATUSBARMANAGERCOMPAT_H
-#define RNSTATUSBARMANAGERCOMPAT_H
-
-#pragma once
-
-#include "RNOH/ArkTSTurboModule.h"
-
-namespace rnoh {
-
-class JSI_EXPORT StatusBarManagerCompat : public ArkTSTurboModule {
-  public:
-    StatusBarManagerCompat(const ArkTSTurboModule::Context ctx, const std::string name);
-};
-
-} // 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 TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_RNSTATUSBARMANAGERCOMPAT_H
+#define TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_RNSTATUSBARMANAGERCOMPAT_H
+
+#ifndef RNSTATUSBARMANAGERCOMPAT_H
+#define RNSTATUSBARMANAGERCOMPAT_H
+
+#pragma once
+
+#include "RNOH/ArkTSTurboModule.h"
+
+namespace rnoh {
+
+class JSI_EXPORT StatusBarManagerCompat : public ArkTSTurboModule {
+  public:
+    StatusBarManagerCompat(const ArkTSTurboModule::Context ctx, const std::string name);
+};
+
+} // namespace rnoh
+
+#endif
+
+#endif