@react-native-ohos/react-native-reanimated 3.18.2-rc.2 → 3.18.2

package/harmony/reanimated/src/main/cpp/patches/AnimatedSensor/AnimatedSensorModule.cpp

@@ -1,89 +1,89 @@
-#include <reanimated/AnimatedSensor/AnimatedSensorModule.h>
-
-#include <utility>
-
-namespace reanimated {
-
-AnimatedSensorModule::AnimatedSensorModule(
-    const PlatformDepMethodsHolder &platformDepMethodsHolder)
-    : platformRegisterSensorFunction_(platformDepMethodsHolder.registerSensor),
-      platformUnregisterSensorFunction_(
-          platformDepMethodsHolder.unregisterSensor) {}
-
-AnimatedSensorModule::~AnimatedSensorModule() {
-  assert(sensorsIds_.empty());
-}
-
-jsi::Value AnimatedSensorModule::registerSensor(
-    jsi::Runtime &rt,
-    const std::shared_ptr<WorkletRuntime> &uiWorkletRuntime,
-    const jsi::Value &sensorTypeValue,
-    const jsi::Value &interval,
-    const jsi::Value &iosReferenceFrame,
-    const jsi::Value &sensorDataHandler) {
-  SensorType sensorType = static_cast<SensorType>(sensorTypeValue.asNumber());
-
-  auto shareableHandler = extractShareableOrThrow<ShareableWorklet>(
-      rt,
-      sensorDataHandler,
-      "[Reanimated] Sensor event handler must be a worklet.");
-
-  int sensorId = platformRegisterSensorFunction_(
-      sensorType,
-      interval.asNumber(),
-      iosReferenceFrame.asNumber(),
-      [sensorType,
-       shareableHandler,
-       weakUiWorkletRuntime = std::weak_ptr<WorkletRuntime>(uiWorkletRuntime)](
-          double newValues[], int orientationDegrees) {
-        auto uiWorkletRuntime = weakUiWorkletRuntime.lock();
-        if (uiWorkletRuntime == nullptr) {
-          return;
-        }
-
-        jsi::Runtime &uiRuntime = uiWorkletRuntime->getJSIRuntime();
-        jsi::Object value(uiRuntime);
-        if (sensorType == SensorType::ROTATION_VECTOR) {
-          // TODO: timestamp should be provided by the platform implementation
-          // such that the native side has a chance of providing a true event
-          // timestamp
-          value.setProperty(uiRuntime, "qx", newValues[0]);
-          value.setProperty(uiRuntime, "qy", newValues[1]);
-          value.setProperty(uiRuntime, "qz", newValues[2]);
-          value.setProperty(uiRuntime, "qw", newValues[3]);
-          value.setProperty(uiRuntime, "yaw", newValues[4]);
-          value.setProperty(uiRuntime, "pitch", newValues[5]);
-          value.setProperty(uiRuntime, "roll", newValues[6]);
-        } else {
-          value.setProperty(uiRuntime, "x", newValues[0]);
-          value.setProperty(uiRuntime, "y", newValues[1]);
-          value.setProperty(uiRuntime, "z", newValues[2]);
-        }
-        value.setProperty(
-            uiRuntime, "interfaceOrientation", orientationDegrees);
-
-        uiWorkletRuntime->runGuarded(shareableHandler, value);
-      });
-  if (sensorId != -1) {
-    sensorsIds_.insert(sensorId);
-  }
-  return jsi::Value(sensorId);
-}
-
-void AnimatedSensorModule::unregisterSensor(const jsi::Value &sensorId) {
-  // It is called during sensor hook unmounting
-  if (!sensorId.isNumber()) {
-    return;
-  }
-  sensorsIds_.erase(sensorId.getNumber());
-  platformUnregisterSensorFunction_(sensorId.asNumber());
-}
-
-void AnimatedSensorModule::unregisterAllSensors() {
-  for (auto sensorId : sensorsIds_) {
-    platformUnregisterSensorFunction_(sensorId);
-  }
-  sensorsIds_.clear();
-}
-
-} // namespace reanimated
+#include <reanimated/AnimatedSensor/AnimatedSensorModule.h>
+
+#include <utility>
+
+namespace reanimated {
+
+AnimatedSensorModule::AnimatedSensorModule(
+    const PlatformDepMethodsHolder &platformDepMethodsHolder)
+    : platformRegisterSensorFunction_(platformDepMethodsHolder.registerSensor),
+      platformUnregisterSensorFunction_(
+          platformDepMethodsHolder.unregisterSensor) {}
+
+AnimatedSensorModule::~AnimatedSensorModule() {
+  assert(sensorsIds_.empty());
+}
+
+jsi::Value AnimatedSensorModule::registerSensor(
+    jsi::Runtime &rt,
+    const std::shared_ptr<WorkletRuntime> &uiWorkletRuntime,
+    const jsi::Value &sensorTypeValue,
+    const jsi::Value &interval,
+    const jsi::Value &iosReferenceFrame,
+    const jsi::Value &sensorDataHandler) {
+  SensorType sensorType = static_cast<SensorType>(sensorTypeValue.asNumber());
+
+  auto shareableHandler = extractShareableOrThrow<ShareableWorklet>(
+      rt,
+      sensorDataHandler,
+      "[Reanimated] Sensor event handler must be a worklet.");
+
+  int sensorId = platformRegisterSensorFunction_(
+      sensorType,
+      interval.asNumber(),
+      iosReferenceFrame.asNumber(),
+      [sensorType,
+       shareableHandler,
+       weakUiWorkletRuntime = std::weak_ptr<WorkletRuntime>(uiWorkletRuntime)](
+          double newValues[], int orientationDegrees) {
+        auto uiWorkletRuntime = weakUiWorkletRuntime.lock();
+        if (uiWorkletRuntime == nullptr) {
+          return;
+        }
+
+        jsi::Runtime &uiRuntime = uiWorkletRuntime->getJSIRuntime();
+        jsi::Object value(uiRuntime);
+        if (sensorType == SensorType::ROTATION_VECTOR) {
+          // TODO: timestamp should be provided by the platform implementation
+          // such that the native side has a chance of providing a true event
+          // timestamp
+          value.setProperty(uiRuntime, "qx", newValues[0]);
+          value.setProperty(uiRuntime, "qy", newValues[1]);
+          value.setProperty(uiRuntime, "qz", newValues[2]);
+          value.setProperty(uiRuntime, "qw", newValues[3]);
+          value.setProperty(uiRuntime, "yaw", newValues[4]);
+          value.setProperty(uiRuntime, "pitch", newValues[5]);
+          value.setProperty(uiRuntime, "roll", newValues[6]);
+        } else {
+          value.setProperty(uiRuntime, "x", newValues[0]);
+          value.setProperty(uiRuntime, "y", newValues[1]);
+          value.setProperty(uiRuntime, "z", newValues[2]);
+        }
+        value.setProperty(
+            uiRuntime, "interfaceOrientation", orientationDegrees);
+
+        uiWorkletRuntime->runGuarded(shareableHandler, value);
+      });
+  if (sensorId != -1) {
+    sensorsIds_.insert(sensorId);
+  }
+  return jsi::Value(sensorId);
+}
+
+void AnimatedSensorModule::unregisterSensor(const jsi::Value &sensorId) {
+  // It is called during sensor hook unmounting
+  if (!sensorId.isNumber()) {
+    return;
+  }
+  sensorsIds_.erase(sensorId.getNumber());
+  platformUnregisterSensorFunction_(sensorId.asNumber());
+}
+
+void AnimatedSensorModule::unregisterAllSensors() {
+  for (auto sensorId : sensorsIds_) {
+    platformUnregisterSensorFunction_(sensorId);
+  }
+  sensorsIds_.clear();
+}
+
+} // namespace reanimated

package/harmony/reanimated/src/main/cpp/patches/NativeModules/ReanimatedModuleProxy.cpp

@@ -228,6 +228,10 @@ void ReanimatedModuleProxy::init(
 }
 
 ReanimatedModuleProxy::~ReanimatedModuleProxy() {
+  invalidate();
+}
+
+void ReanimatedModuleProxy::invalidate() {
   // event handler registry and frame callbacks store some JSI values from UI
   // runtime, so they have to go away before we tear down the runtime
   eventHandlerRegistry_.reset();

package/harmony/reanimated/src/main/module.json5

@@ -1,13 +1,13 @@
-{
-  "module": {
-    "name": "reanimated",
-    "type": "har",
-    "description": "$string:module_desc",
-    "mainElement": "ReanimatedAbility",
-    "deviceTypes": [
-      "phone",
-      "tablet",
-      "2in1"
-    ],
-  }
+{
+  "module": {
+    "name": "reanimated",
+    "type": "har",
+    "description": "$string:module_desc",
+    "mainElement": "ReanimatedAbility",
+    "deviceTypes": [
+      "phone",
+      "tablet",
+      "2in1"
+    ],
+  }
 }

package/harmony/reanimated/src/main/resources/base/element/color.json

@@ -1,8 +1,8 @@
-{
-  "color": [
-    {
-      "name": "start_window_background",
-      "value": "#FFFFFF"
-    }
-  ]
+{
+  "color": [
+    {
+      "name": "start_window_background",
+      "value": "#FFFFFF"
+    }
+  ]
 }

package/harmony/reanimated/src/main/resources/base/element/string.json

@@ -1,16 +1,16 @@
-{
-  "string": [
-    {
-      "name": "module_desc",
-      "value": "module description"
-    },
-    {
-      "name": "ReanimatedAbility_desc",
-      "value": "description"
-    },
-    {
-      "name": "ReanimatedAbility_label",
-      "value": "label"
-    }
-  ]
+{
+  "string": [
+    {
+      "name": "module_desc",
+      "value": "module description"
+    },
+    {
+      "name": "ReanimatedAbility_desc",
+      "value": "description"
+    },
+    {
+      "name": "ReanimatedAbility_label",
+      "value": "label"
+    }
+  ]
 }

package/harmony/reanimated/src/main/resources/base/profile/main_pages.json

@@ -1,5 +1,5 @@
-{
-  "src": [
-    "pages/Index"
-  ]
-}
+{
+  "src": [
+    "pages/Index"
+  ]
+}

package/harmony/reanimated/src/main/resources/en_US/element/string.json

@@ -1,16 +1,16 @@
-{
-  "string": [
-    {
-      "name": "module_desc",
-      "value": "module description"
-    },
-    {
-      "name": "ReanimatedAbility_desc",
-      "value": "description"
-    },
-    {
-      "name": "ReanimatedAbility_label",
-      "value": "label"
-    }
-  ]
+{
+  "string": [
+    {
+      "name": "module_desc",
+      "value": "module description"
+    },
+    {
+      "name": "ReanimatedAbility_desc",
+      "value": "description"
+    },
+    {
+      "name": "ReanimatedAbility_label",
+      "value": "label"
+    }
+  ]
 }

package/harmony/reanimated/src/main/resources/zh_CN/element/string.json

@@ -1,16 +1,16 @@
-{
-  "string": [
-    {
-      "name": "module_desc",
-      "value": "模块描述"
-    },
-    {
-      "name": "ReanimatedAbility_desc",
-      "value": "description"
-    },
-    {
-      "name": "ReanimatedAbility_label",
-      "value": "label"
-    }
-  ]
+{
+  "string": [
+    {
+      "name": "module_desc",
+      "value": "模块描述"
+    },
+    {
+      "name": "ReanimatedAbility_desc",
+      "value": "description"
+    },
+    {
+      "name": "ReanimatedAbility_label",
+      "value": "label"
+    }
+  ]
 }

package/harmony/reanimated/ts.ts

@@ -1,6 +1,6 @@
-// Copyright (c) 2025 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.
-
-export * from './src/main/ets/ReanimatedPackage';
-export * from './src/main/ets/ReanimatedModule';
+// Copyright (c) 2025 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.
+
+export * from './src/main/ets/ReanimatedPackage';
+export * from './src/main/ets/ReanimatedModule';

package/package.json

@@ -1,50 +1,50 @@
-{
-  "name": "@react-native-ohos/react-native-reanimated",
-  "harmony": {
-    "alias": "react-native-reanimated",
-    "redirectInternalImports": true
-  },
-  "version": "3.18.2-rc.2",
-  "description": "",
-  "main": "lib/index.js",
-  "scripts": {
-    "build": "tsc",
-    "pack:prod": "npm pack",
-    "prepack": "npm run build",
-    "prepublishOnly": "npm run prepack && react-native verify-package-harmony --package-path . --skip-checks oh_package_name_is_derived_from_npm_package_name",
-    "update_version": "node ./scripts/update-version.js",
-    "deploy": "node ./scripts/deploy.js"
-  },
-  "peerDependencies": {
-    "react": "*",
-    "react-native": "*",
-    "react-native-harmony": "*",
-    "react-native-reanimated": "3.18.0"
-  },
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@types/node": "^20.11.4",
-    "react-native-reanimated": "3.18.0"
-  },
-  "devDependencies": {
-    "@babel/cli": "^7.23.4",
-    "@babel/core": "^7.23.7",
-    "@babel/preset-env": "^7.23.8",
-    "@babel/preset-typescript": "^7.23.3",
-    "@babel/runtime": "^7.23.8",
-    "@types/invariant": "^2.2.35",
-    "@types/react": "^18.2.15",
-    "metro-react-native-babel-preset": "^0.77.0",
-    "react": "18.3.1",
-    "react-native": "0.77.1",
-    "react-native-builder-bob": "^0.21.3",
-    "typescript": "^5.1.6"
-  },
-  "files": [
-    "lib",
-    "harmony",
-    "src",
-    "./harmony.tar.gz"
-  ]
-}
+{
+  "name": "@react-native-ohos/react-native-reanimated",
+  "harmony": {
+    "alias": "react-native-reanimated",
+    "redirectInternalImports": true
+  },
+  "version": "3.18.2",
+  "description": "",
+  "main": "lib/index.js",
+  "scripts": {
+    "build": "tsc",
+    "pack:prod": "npm pack",
+    "prepack": "npm run build",
+    "prepublishOnly": "npm run prepack && react-native verify-package-harmony --package-path . --skip-checks oh_package_name_is_derived_from_npm_package_name",
+    "update_version": "node ./scripts/update-version.js",
+    "deploy": "node ./scripts/deploy.js"
+  },
+  "peerDependencies": {
+    "react": "*",
+    "react-native": "*",
+    "react-native-harmony": "*",
+    "react-native-reanimated": "3.18.0"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@types/node": "^20.11.4",
+    "react-native-reanimated": "3.18.0"
+  },
+  "devDependencies": {
+    "@babel/cli": "^7.23.4",
+    "@babel/core": "^7.23.7",
+    "@babel/preset-env": "^7.23.8",
+    "@babel/preset-typescript": "^7.23.3",
+    "@babel/runtime": "^7.23.8",
+    "@types/invariant": "^2.2.35",
+    "@types/react": "^18.2.15",
+    "metro-react-native-babel-preset": "^0.77.0",
+    "react": "18.3.1",
+    "react-native": "0.77.1",
+    "react-native-builder-bob": "^0.21.3",
+    "typescript": "^5.1.6"
+  },
+  "files": [
+    "lib",
+    "harmony",
+    "src",
+    "./harmony.tar.gz"
+  ]
+}