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

package/harmony/keyboard_controller/Index.ets

@@ -1,28 +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.
- */
-
-export * from './ts';
+/*
+ * 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.
+ */
+
+export * from './ts';

package/harmony/keyboard_controller/build-profile.json5

@@ -1,31 +1,31 @@
-{
-  "apiType": "stageMode",
-  "buildOption": {
-  },
-  "buildOptionSet": [
-    {
-      "name": "release",
-      "arkOptions": {
-        "obfuscation": {
-          "ruleOptions": {
-            "enable": true,
-            "files": [
-              "./obfuscation-rules.txt"
-            ]
-          },
-          "consumerFiles": [
-            "./consumer-rules.txt"
-          ]
-        }
-      },
-    },
-  ],
-  "targets": [
-    {
-      "name": "default"
-    },
-    {
-      "name": "ohosTest"
-    }
-  ]
-}
+{
+  "apiType": "stageMode",
+  "buildOption": {
+  },
+  "buildOptionSet": [
+    {
+      "name": "release",
+      "arkOptions": {
+        "obfuscation": {
+          "ruleOptions": {
+            "enable": true,
+            "files": [
+              "./obfuscation-rules.txt"
+            ]
+          },
+          "consumerFiles": [
+            "./consumer-rules.txt"
+          ]
+        }
+      },
+    },
+  ],
+  "targets": [
+    {
+      "name": "default"
+    },
+    {
+      "name": "ohosTest"
+    }
+  ]
+}

package/harmony/keyboard_controller/hvigorfile.ts

@@ -1,6 +1,6 @@
-import { harTasks } from '@ohos/hvigor-ohos-plugin';
-
-export default {
-    system: harTasks,  /* Built-in plugin of Hvigor. It cannot be modified. */
-    plugins:[]         /* Custom plugin to extend the functionality of Hvigor. */
-}
+import { harTasks } from '@ohos/hvigor-ohos-plugin';
+
+export default {
+    system: harTasks,  /* Built-in plugin of Hvigor. It cannot be modified. */
+    plugins:[]         /* Custom plugin to extend the functionality of Hvigor. */
+}

package/harmony/keyboard_controller/obfuscation-rules.txt

@@ -1,18 +1,18 @@
-# Define project specific obfuscation rules here.
-# You can include the obfuscation configuration files in the current module's build-profile.json5.
-#
-# For more details, see
-#   https://developer.huawei.com/consumer/cn/doc/harmonyos-guides-V5/source-obfuscation-V5
-
-# Obfuscation options:
-# -disable-obfuscation: disable all obfuscations
-# -enable-property-obfuscation: obfuscate the property names
-# -enable-toplevel-obfuscation: obfuscate the names in the global scope
-# -compact: remove unnecessary blank spaces and all line feeds
-# -remove-log: remove all console.* statements
-# -print-namecache: print the name cache that contains the mapping from the old names to new names
-# -apply-namecache: reuse the given cache file
-
-# Keep options:
-# -keep-property-name: specifies property names that you want to keep
+# Define project specific obfuscation rules here.
+# You can include the obfuscation configuration files in the current module's build-profile.json5.
+#
+# For more details, see
+#   https://developer.huawei.com/consumer/cn/doc/harmonyos-guides-V5/source-obfuscation-V5
+
+# Obfuscation options:
+# -disable-obfuscation: disable all obfuscations
+# -enable-property-obfuscation: obfuscate the property names
+# -enable-toplevel-obfuscation: obfuscate the names in the global scope
+# -compact: remove unnecessary blank spaces and all line feeds
+# -remove-log: remove all console.* statements
+# -print-namecache: print the name cache that contains the mapping from the old names to new names
+# -apply-namecache: reuse the given cache file
+
+# Keep options:
+# -keep-property-name: specifies property names that you want to keep
 # -keep-global-name: specifies names that you want to keep in the global scope

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

@@ -1,20 +1,29 @@
-{
-  "meta": {
-    "stableOrder": true,
-    "enableUnifiedLockfile": false
-  },
-  "lockfileVersion": 3,
-  "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
-  "specifiers": {
-    "@ohos/materialprogressbar@2.1.3-rc.0": "@ohos/materialprogressbar@2.1.3-rc.0",
-    "@rnoh/react-native-openharmony@../../../../tester/25P4/node_modules/@react-native-oh/react-native-harmony/react_native_openharmony.har": "@rnoh/react-native-openharmony@../../../../tester/25P4/node_modules/@react-native-oh/react-native-harmony/react_native_openharmony.har"
-  },
-  "packages": {
-    "@rnoh/react-native-openharmony@../../../../tester/25P4/node_modules/@react-native-oh/react-native-harmony/react_native_openharmony.har": {
-      "name": "@rnoh/react-native-openharmony",
-      "version": "0.77.22",
-      "resolved": "../../../../tester/25P4/node_modules/@react-native-oh/react-native-harmony/react_native_openharmony.har",
-      "registryType": "local"
-    }
-  }
+{
+  "meta": {
+    "stableOrder": true
+  },
+  "lockfileVersion": 3,
+  "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
+  "specifiers": {
+    "@ppd/ffrt@1.1.10": "@ppd/ffrt@1.1.10",
+    "@rnoh/react-native-openharmony@../../example/node_modules/react-native-harmony/react_native_openharmony.har": "@rnoh/react-native-openharmony@../../example/node_modules/react-native-harmony/react_native_openharmony.har"
+  },
+  "packages": {
+    "@ppd/ffrt@1.1.10": {
+      "name": "@ppd/ffrt",
+      "version": "1.1.10",
+      "integrity": "sha512-hRV0R2dKn9nqcOHhya5jRrTMoB51icGRNXem+WGJOKQdByXaEpI8NGT2BNjlR1Zf6zquQ2jxtsnSMzB88mbF7Q==",
+      "resolved": "https://ohpm.openharmony.cn/ohpm/@ppd/ffrt/-/ffrt-1.1.10.har",
+      "registryType": "ohpm"
+    },
+    "@rnoh/react-native-openharmony@../../example/node_modules/react-native-harmony/react_native_openharmony.har": {
+      "name": "@rnoh/react-native-openharmony",
+      "version": "0.77.74",
+      "resolved": "../../example/node_modules/react-native-harmony/react_native_openharmony.har",
+      "registryType": "local",
+      "dependencies": {
+        "@ppd/ffrt": "1.1.10"
+      }
+    }
+  }
 }

package/harmony/keyboard_controller/oh-package.json5

@@ -1,11 +1,11 @@
-{
-  "name": "@react-native-ohos/react-native-keyboard-controller",
-  "version": "1.16.7",
-  "description": " control keyboard show or hide",
-  "main": "Index.ets",
-  "author": "",
-  "license": "MIT License",
-  "dependencies": {
-    "@rnoh/react-native-openharmony": "file:../react_native_openharmony",
-  }
+{
+  "name": "@react-native-ohos/react-native-keyboard-controller",
+  "version": "1.16.8",
+  "description": " control keyboard show or hide",
+  "main": "Index.ets",
+  "author": "",
+  "license": "MIT License",
+  "dependencies": {
+    "@rnoh/react-native-openharmony": "file:../react_native_openharmony",
+  }
 }

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

@@ -1,7 +1,7 @@
-cmake_minimum_required(VERSION 3.13)
-set(CMAKE_VERBOSE_MAKEFILE on)
-
-file(GLOB rnoh_keyboard_controller_SRC CONFIGURE_DEPENDS *.cpp)
-add_library(rnoh_keyboard_controller SHARED ${rnoh_keyboard_controller_SRC})
-target_include_directories(rnoh_keyboard_controller PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries(rnoh_keyboard_controller PUBLIC rnoh)
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+file(GLOB rnoh_keyboard_controller_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(rnoh_keyboard_controller SHARED ${rnoh_keyboard_controller_SRC})
+target_include_directories(rnoh_keyboard_controller PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(rnoh_keyboard_controller PUBLIC rnoh)

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

@@ -1,96 +1,119 @@
-/*
- * 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 <glog/logging.h>
-#include "EventEmitters.h"
-
-namespace facebook {
-namespace react {
-
-void KeyboardControllerViewEventEmitter::onKeyboardMoveStart(MoveEvent event) const {
-    dispatchEvent("KeyboardMoveStart", [event = std::move(event)](jsi::Runtime &runtime) {
-        auto payload = jsi::Object(runtime);
-        payload.setProperty(runtime, "height", event.height);
-        payload.setProperty(runtime, "target", event.target);
-        payload.setProperty(runtime, "duration", event.duration);
-        payload.setProperty(runtime, "progress", event.progress);
-        return payload;
-    });
-}
-
-void KeyboardControllerViewEventEmitter::onKeyboardMove(MoveEvent event) const {
-    dispatchEvent("KeyboardMove", [event = std::move(event)](jsi::Runtime &runtime) {
-        auto payload = jsi::Object(runtime);
-        payload.setProperty(runtime, "height", event.height);
-        payload.setProperty(runtime, "target", event.target);
-        payload.setProperty(runtime, "duration", event.duration);
-        payload.setProperty(runtime, "progress", event.progress);
-        return payload;
-    });
-}
-void KeyboardControllerViewEventEmitter::onKeyboardMoveEnd(MoveEvent event) const {
-    dispatchEvent("KeyboardMoveEnd", [event = std::move(event)](jsi::Runtime &runtime) {
-        auto payload = jsi::Object(runtime);
-        payload.setProperty(runtime, "height", event.height);
-        payload.setProperty(runtime, "target", event.target);
-        payload.setProperty(runtime, "duration", event.duration);
-        payload.setProperty(runtime, "progress", event.progress);
-        return payload;
-    });
-}
-void KeyboardControllerViewEventEmitter::onKeyboardMoveInteractive(MoveEvent event) const {
-    dispatchEvent("KeyboardMoveInteractive", [event = std::move(event)](jsi::Runtime &runtime) {
-        auto payload = jsi::Object(runtime);
-        payload.setProperty(runtime, "height", event.height);
-        payload.setProperty(runtime, "target", event.target);
-        payload.setProperty(runtime, "duration", event.duration);
-        payload.setProperty(runtime, "progress", event.progress);
-        return payload;
-    });
-}
-void KeyboardControllerViewEventEmitter::onFocusedInputLayoutChanged(InputLayoutEvent event) const {
-    dispatchEvent("FocusedInputLayoutChanged", [event = std::move(event)](jsi::Runtime &runtime) {
-        auto payload = jsi::Object(runtime);
-        return payload;
-    });
-}
-void KeyboardControllerViewEventEmitter::onFocusedInputTextChanged(TextChangeEvent event) const {
-    dispatchEvent("FocusedInputTextChanged", [event = std::move(event)](jsi::Runtime &runtime) {
-        auto payload = jsi::Object(runtime);
-        payload.setProperty(runtime, "text", event.text);
-        return payload;
-    });
-}
-void KeyboardControllerViewEventEmitter::onFocusedInputSelectionChanged(InputSectionEvent event) const {
-    dispatchEvent("FocusedInputSelectionChanged", [event = std::move(event)](jsi::Runtime &runtime) {
-        auto payload = jsi::Object(runtime);
-        return payload;
-    });
-}
-
-} // namespace react
-} // namespace facebook
+/*
+ * 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 <glog/logging.h>
+#include "EventEmitters.h"
+
+namespace facebook {
+namespace react {
+
+void KeyboardControllerViewEventEmitter::onKeyboardMoveStart(MoveEvent event) const {
+    dispatchEvent("KeyboardMoveStart", [event = std::move(event)](jsi::Runtime &runtime) {
+        auto payload = jsi::Object(runtime);
+        payload.setProperty(runtime, "height", event.height);
+        payload.setProperty(runtime, "target", event.target);
+        payload.setProperty(runtime, "duration", event.duration);
+        payload.setProperty(runtime, "progress", event.progress);
+        return payload;
+    });
+}
+
+void KeyboardControllerViewEventEmitter::onKeyboardMove(MoveEvent event) const {
+    dispatchEvent("KeyboardMove", [event = std::move(event)](jsi::Runtime &runtime) {
+        auto payload = jsi::Object(runtime);
+        payload.setProperty(runtime, "height", event.height);
+        payload.setProperty(runtime, "target", event.target);
+        payload.setProperty(runtime, "duration", event.duration);
+        payload.setProperty(runtime, "progress", event.progress);
+        return payload;
+    });
+}
+void KeyboardControllerViewEventEmitter::onKeyboardMoveEnd(MoveEvent event) const {
+    dispatchEvent("KeyboardMoveEnd", [event = std::move(event)](jsi::Runtime &runtime) {
+        auto payload = jsi::Object(runtime);
+        payload.setProperty(runtime, "height", event.height);
+        payload.setProperty(runtime, "target", event.target);
+        payload.setProperty(runtime, "duration", event.duration);
+        payload.setProperty(runtime, "progress", event.progress);
+        return payload;
+    });
+}
+void KeyboardControllerViewEventEmitter::onKeyboardMoveInteractive(MoveEvent event) const {
+    dispatchEvent("KeyboardMoveInteractive", [event = std::move(event)](jsi::Runtime &runtime) {
+        auto payload = jsi::Object(runtime);
+        payload.setProperty(runtime, "height", event.height);
+        payload.setProperty(runtime, "target", event.target);
+        payload.setProperty(runtime, "duration", event.duration);
+        payload.setProperty(runtime, "progress", event.progress);
+        return payload;
+    });
+}
+void KeyboardControllerViewEventEmitter::onFocusedInputLayoutChanged(InputLayoutEvent event) const {
+    dispatchEvent("FocusedInputLayoutChanged", [event = std::move(event)](jsi::Runtime &runtime) {
+        auto payload = jsi::Object(runtime);
+        payload.setProperty(runtime, "target", event.target);
+        payload.setProperty(runtime, "parentScrollViewTarget", event.parentScrollViewTarget);
+        auto layout = jsi::Object(runtime);
+        layout.setProperty(runtime, "absoluteX", event.layout.absoluteX);
+        layout.setProperty(runtime, "absoluteY", event.layout.absoluteY);
+        layout.setProperty(runtime, "x", event.layout.x);
+        layout.setProperty(runtime, "y", event.layout.y);
+        layout.setProperty(runtime, "width", event.layout.width);
+        layout.setProperty(runtime, "height", event.layout.height);
+        payload.setProperty(runtime, "layout", std::move(layout));
+        return payload;
+    });
+}
+void KeyboardControllerViewEventEmitter::onFocusedInputTextChanged(TextChangeEvent event) const {
+    dispatchEvent("FocusedInputTextChanged", [event = std::move(event)](jsi::Runtime &runtime) {
+        auto payload = jsi::Object(runtime);
+        payload.setProperty(runtime, "text", event.text);
+        return payload;
+    });
+}
+void KeyboardControllerViewEventEmitter::onFocusedInputSelectionChanged(InputSectionEvent event) const {
+    dispatchEvent("FocusedInputSelectionChanged", [event = std::move(event)](jsi::Runtime &runtime) {
+        auto payload = jsi::Object(runtime);
+        payload.setProperty(runtime, "target", event.target);
+        auto selection = jsi::Object(runtime);
+        auto start = jsi::Object(runtime);
+        start.setProperty(runtime, "x", event.selection.start.x);
+        start.setProperty(runtime, "y", event.selection.start.y);
+        start.setProperty(runtime, "position", event.selection.start.position);
+        auto end = jsi::Object(runtime);
+        end.setProperty(runtime, "x", event.selection.end.x);
+        end.setProperty(runtime, "y", event.selection.end.y);
+        end.setProperty(runtime, "position", event.selection.end.position);
+        selection.setProperty(runtime, "start", std::move(start));
+        selection.setProperty(runtime, "end", std::move(end));
+        payload.setProperty(runtime, "selection", std::move(selection));
+        return payload;
+    });
+}
+
+} // namespace react
+} // namespace facebook