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

package/harmony/keyboard_controller/src/main/cpp/keyboardControllerPackage.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 "keyboardControllerPackage.h"
-#include "KeyboardControllerViewJSIBinder.h"
-#include "KeyboardGestureAreaJSIBinder.h"
-
-
-using namespace facebook;
-using namespace rnoh;
-
-std::vector<facebook::react::ComponentDescriptorProvider>
-KeyboardControllerPackage::createComponentDescriptorProviders() {
-    return {facebook::react::concreteComponentDescriptorProvider<
-                facebook::react::KeyboardControllerViewComponentDescriptor>(),
-            facebook::react::concreteComponentDescriptorProvider<
-                facebook::react::KeyboardGestureAreaComponentDescriptor>()};
-}
-ComponentJSIBinderByString KeyboardControllerPackage::createComponentJSIBinderByName() {
-    return {{"RNKeyboardControllerView", std::make_shared<KeyboardControllerViewJSIBinder>()},
-            {"RNKeyboardGestureArea", std::make_shared<KeyboardGestureAreaJSIBinder>()}};
-}
-
-std::unique_ptr<TurboModuleFactoryDelegate> KeyboardControllerPackage::createTurboModuleFactoryDelegate() {
-    return std::make_unique<KeyboardControllerTurboModuleFactoryDelegate>();
-}
-
-ComponentInstanceFactoryDelegate::Shared KeyboardControllerPackage::createComponentInstanceFactoryDelegate() {
-    return std::make_shared<KeyboardControllerComponentInstanceFactoryDelegate>();
-};
-
-ComponentInstance::Shared KeyboardControllerPackage::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 "keyboardControllerPackage.h"
+#include "KeyboardControllerViewJSIBinder.h"
+#include "KeyboardGestureAreaJSIBinder.h"
+
+
+using namespace facebook;
+using namespace rnoh;
+
+std::vector<facebook::react::ComponentDescriptorProvider>
+KeyboardControllerPackage::createComponentDescriptorProviders() {
+    return {facebook::react::concreteComponentDescriptorProvider<
+                facebook::react::KeyboardControllerViewComponentDescriptor>(),
+            facebook::react::concreteComponentDescriptorProvider<
+                facebook::react::KeyboardGestureAreaComponentDescriptor>()};
+}
+ComponentJSIBinderByString KeyboardControllerPackage::createComponentJSIBinderByName() {
+    return {{"RNKeyboardControllerView", std::make_shared<KeyboardControllerViewJSIBinder>()},
+            {"RNKeyboardGestureArea", std::make_shared<KeyboardGestureAreaJSIBinder>()}};
+}
+
+std::unique_ptr<TurboModuleFactoryDelegate> KeyboardControllerPackage::createTurboModuleFactoryDelegate() {
+    return std::make_unique<KeyboardControllerTurboModuleFactoryDelegate>();
+}
+
+ComponentInstanceFactoryDelegate::Shared KeyboardControllerPackage::createComponentInstanceFactoryDelegate() {
+    return std::make_shared<KeyboardControllerComponentInstanceFactoryDelegate>();
+};
+
+ComponentInstance::Shared KeyboardControllerPackage::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/keyboardControllerPackage.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_KEYBOARDCONTROLLERPACKAGE_H
-#define TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_KEYBOARDCONTROLLERPACKAGE_H
-
-#ifndef KEYBOARDCONTROLLERPACKAGE_H
-#define KEYBOARDCONTROLLERPACKAGE_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 KeyboardControllerPackage : public Package{
-public:
-    KeyboardControllerPackage(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_KEYBOARDCONTROLLERPACKAGE_H
+#define TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_KEYBOARDCONTROLLERPACKAGE_H
+
+#ifndef KEYBOARDCONTROLLERPACKAGE_H
+#define KEYBOARDCONTROLLERPACKAGE_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 KeyboardControllerPackage : public Package{
+public:
+    KeyboardControllerPackage(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/ets/Logger.ts

@@ -1,67 +1,46 @@
-/*
- * 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.
- */
-
-import hilog from '@ohos.hilog';
-
-class Logger {
-  private domain: number;
-  private prefix: string;
-  private format: string = '%{public}s, %{public}s';
-  private isDebug: boolean;
-
-  /**
-   * constructor.
-   *
-   * @param Prefix Identifies the log tag.
-   * @param domain Domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFFF.
-   */
-  constructor(prefix: string = 'MyApp', domain: number = 0xFF00, isDebug = false) {
-    this.prefix = prefix;
-    this.domain = domain;
-    this.isDebug = isDebug;
-  }
-
-  debug(...args: string[]): void {
-    if(this.isDebug) {
-      hilog.debug(this.domain, this.prefix, this.format, args);
-    }
-  }
-
-  info(...args: string[]): void {
-    hilog.info(this.domain, this.prefix, this.format, args);
-  }
-
-  warn(...args: string[]): void {
-    hilog.warn(this.domain, this.prefix, this.format, args);
-  }
-
-  error(...args: string[]): void {
-    hilog.error(this.domain, this.prefix, this.format, args);
-  }
-}
-
+/*
+ * 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.
+ */
+
+import hilog from '@ohos.hilog';
+
+class Logger {
+  private domain: number;
+  private prefix: string;
+  private format: string = '%{public}s, %{public}s';
+  private isDebug: boolean;
+
+  /**
+   * constructor.
+   *
+   * @param Prefix Identifies the log tag.
+   * @param domain Domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFFF.
+   */
+  constructor(prefix: string = 'MyApp', domain: number = 0xFF00, isDebug = false) {
+    this.prefix = prefix;
+    this.domain = domain;
+    this.isDebug = isDebug;
+  }
+
+  debug(...args: string[]): void {
+    if(this.isDebug) {
+      hilog.debug(this.domain, this.prefix, this.format, args);
+    }
+  }
+
+  info(...args: string[]): void {
+    hilog.info(this.domain, this.prefix, this.format, args);
+  }
+
+  warn(...args: string[]): void {
+    hilog.warn(this.domain, this.prefix, this.format, args);
+  }
+
+  error(...args: string[]): void {
+    hilog.error(this.domain, this.prefix, this.format, args);
+  }
+}
+
 export default new Logger('RNSVG', 0xFF00, false)

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

@@ -1,70 +1,49 @@
-/*
- * 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.
- */
-
-import {TurboModulesFactory} from  '@rnoh/react-native-openharmony/ts';
-import type { TurboModule, TurboModuleContext, } from '@rnoh/react-native-openharmony/ts';
-import {RNKeyboardControllerTurboModule} from  './RNKeyboardControllerTurboModule';
-import {RNStatusBarManagerCompatTurboModule} from './RNStatusBarManagerCompatTurboModule';
-import { RNOHPackage } from '@rnoh/react-native-openharmony'
-
-class RNKeyboardControllerTurboModuleFactory extends TurboModulesFactory {
-  createTurboModule(name: string): TurboModule | null {
-    if (name === 'KeyboardController') {
-      return new RNKeyboardControllerTurboModule(this.ctx);
-    } else if (name === 'StatusBarManagerCompat') {
-      return new RNStatusBarManagerCompatTurboModule(this.ctx);
-    }
-    return null;
-  }
-  
-  hasTurboModule(name: string): boolean {
-    return name === 'KeyboardController' || name === 'StatusBarManagerCompat';
-  }
-
-}
-class RNStatusBarManagerCompatTurboModuleFactory extends TurboModulesFactory {
-  createTurboModule(name: string): TurboModule | null {
-    if(this.hasTurboModule(name)){
-      return new RNStatusBarManagerCompatTurboModule(this.ctx);
-    }
-    return null;
-  }
-  hasTurboModule(name: string): boolean {
-    return name === 'StatusBarManagerCompat';
-  }
-}
-
-export  class  RNKeyboardControllerPackage extends RNOHPackage {
-  createTurboModulesFactory(ctx: TurboModuleContext): TurboModulesFactory {
-     return new RNKeyboardControllerTurboModuleFactory(ctx);
-  }
-}
-export  class  RNStatusBarManagerCompatPackage extends RNOHPackage {
-  createTurboModulesFactory(ctx: TurboModuleContext): TurboModulesFactory {
-    return new RNStatusBarManagerCompatTurboModuleFactory(ctx);
-  }
-}
+/*
+ * 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.
+ */
+
+import {TurboModulesFactory} from  '@rnoh/react-native-openharmony/ts';
+import type { TurboModule, TurboModuleContext, } from '@rnoh/react-native-openharmony/ts';
+import {RNKeyboardControllerTurboModule} from  './RNKeyboardControllerTurboModule';
+import {RNStatusBarManagerCompatTurboModule} from './RNStatusBarManagerCompatTurboModule';
+import { RNOHPackage } from '@rnoh/react-native-openharmony'
+
+class RNKeyboardControllerTurboModuleFactory extends TurboModulesFactory {
+  createTurboModule(name: string): TurboModule | null {
+    if (name === 'KeyboardController') {
+      return new RNKeyboardControllerTurboModule(this.ctx);
+    } else if (name === 'StatusBarManagerCompat') {
+      return new RNStatusBarManagerCompatTurboModule(this.ctx);
+    }
+    return null;
+  }
+  
+  hasTurboModule(name: string): boolean {
+    return name === 'KeyboardController' || name === 'StatusBarManagerCompat';
+  }
+
+}
+class RNStatusBarManagerCompatTurboModuleFactory extends TurboModulesFactory {
+  createTurboModule(name: string): TurboModule | null {
+    if(this.hasTurboModule(name)){
+      return new RNStatusBarManagerCompatTurboModule(this.ctx);
+    }
+    return null;
+  }
+  hasTurboModule(name: string): boolean {
+    return name === 'StatusBarManagerCompat';
+  }
+}
+
+export  class  RNKeyboardControllerPackage extends RNOHPackage {
+  createTurboModulesFactory(ctx: TurboModuleContext): TurboModulesFactory {
+     return new RNKeyboardControllerTurboModuleFactory(ctx);
+  }
+}
+export  class  RNStatusBarManagerCompatPackage extends RNOHPackage {
+  createTurboModulesFactory(ctx: TurboModuleContext): TurboModulesFactory {
+    return new RNStatusBarManagerCompatTurboModuleFactory(ctx);
+  }
+}