@react-native-ohos/react-native-reanimated 3.18.2 → 3.18.3-beta.2

package/LICENSE

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Software Mansion <swmansion.com>
-
-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.
+The MIT License (MIT)
+
+Copyright (c) 2016 Software Mansion <swmansion.com>
+
+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.

package/README.OpenSource

@@ -1,11 +1,11 @@
-[
-    {
-        "Name": "react-native-reanimated",
-        "License": "MIT License",
-        "License File": "LICENSE",
-        "Version Number": "3.18.0",
-        "Owner" : "xiafeng@huawei.com",
-        "Upstream URL": "https://github.com/software-mansion/react-native-reanimated",
-        "Description": "React Native's Animated library reimplemented"
-    }
+[
+    {
+        "Name": "react-native-reanimated",
+        "License": "MIT License",
+        "License File": "LICENSE",
+        "Version Number": "3.18.0",
+        "Owner" : "xiafeng@huawei.com",
+        "Upstream URL": "https://github.com/software-mansion/react-native-reanimated",
+        "Description": "React Native's Animated library reimplemented"
+    }
 ]

package/README.md

@@ -1,10 +1,10 @@
-# @react-native-ohos/react-native-reanimated
-This project is based on [react-native-reanimated@v3.18.0](https://github.com/software-mansion/react-native-reanimated/tree/3.18.0)
-
-## Documentation
-[中文](https://gitcode.com/OpenHarmony-RN/usage-docs/blob/master/zh-cn/react-native-reanimated.md)
-
-[English](https://gitcode.com/OpenHarmony-RN/usage-docs/blob/master/en/react-native-reanimated.md)
-
-## License
-This library is licensed under [The MIT License (MIT)](https://github.com/react-native-oh-library/react-native-harmony-reanimated/blob/sig/LICENSE).
+# @react-native-ohos/react-native-reanimated
+This project is based on [react-native-reanimated@v3.18.0](https://github.com/software-mansion/react-native-reanimated/tree/3.18.0)
+
+## Documentation
+[中文](https://gitcode.com/OpenHarmony-RN/usage-docs/blob/master/zh-cn/react-native-reanimated.md)
+
+[English](https://gitcode.com/OpenHarmony-RN/usage-docs/blob/master/en/react-native-reanimated.md)
+
+## License
+This library is licensed under [The MIT License (MIT)](https://github.com/react-native-oh-library/react-native-harmony-reanimated/blob/sig/LICENSE).

package/harmony/reanimated/BuildProfile.ets

@@ -1,7 +1,7 @@
 /**
  * Use these variables when you tailor your ArkTS code. They must be of the const type.
  */
-export const HAR_VERSION = '3.18.2';
+export const HAR_VERSION = '3.18.3-beta.2';
 export const BUILD_MODE_NAME = 'debug';
 export const DEBUG = true;
 export const TARGET_NAME = 'default';

package/harmony/reanimated/build-profile.json5

@@ -1,12 +1,12 @@
-{
-  "apiType": 'stageMode',
-  "targets": [
-    {
-      "name": "default",
-      "runtimeOS": "HarmonyOS"
-    },
-    {
-      "name": "ohosTest",
-    }
-  ]
+{
+  "apiType": 'stageMode',
+  "targets": [
+    {
+      "name": "default",
+      "runtimeOS": "HarmonyOS"
+    },
+    {
+      "name": "ohosTest",
+    }
+  ]
 }

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

@@ -0,0 +1,29 @@
+{
+  "meta": {
+    "stableOrder": true
+  },
+  "lockfileVersion": 3,
+  "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
+  "specifiers": {
+    "@ppd/ffrt@1.1.5": "@ppd/ffrt@1.1.5",
+    "@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.5": {
+      "name": "@ppd/ffrt",
+      "version": "1.1.5",
+      "integrity": "sha512-MbXdRqeNHQQv4ALTGdosvOCQI+xH8nt0+E2/aFLS4UuGJ5541MAeenRCDOrgIG05k7SnSJ4WngsCfjj3FbTCQg==",
+      "resolved": "https://ohpm.openharmony.cn/ohpm/@ppd/ffrt/-/ffrt-1.1.5.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.71",
+      "resolved": "../../example/node_modules/react-native-harmony/react_native_openharmony.har",
+      "registryType": "local",
+      "dependencies": {
+        "@ppd/ffrt": "1.1.5"
+      }
+    }
+  }
+}

package/harmony/reanimated/oh-package.json5

@@ -1,12 +1,12 @@
-{
-  name: '@react-native-ohos/react-native-reanimated',
-  version: '3.18.2',
-  description: "",
-  type: 'module',
-  main: 'index.ets',
-  author: '',
-  license: '',
-  dependencies: {
-    "@rnoh/react-native-openharmony": "file:../react_native_openharmony.har",
-  },
+{
+  name: '@react-native-ohos/react-native-reanimated',
+  version: '3.18.3-beta.2',
+  description: "",
+  type: 'module',
+  main: 'index.ets',
+  author: '',
+  license: '',
+  dependencies: {
+    "@rnoh/react-native-openharmony": "file:../react_native_openharmony.har",
+  },
 }

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

@@ -1,86 +1,86 @@
-#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
-  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
+  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/Common/cpp/reanimated/AnimatedSensor/AnimatedSensorModule.h

@@ -1,47 +1,47 @@
-#pragma once
-
-#include <reanimated/Tools/PlatformDepMethodsHolder.h>
-
-#include <worklets/SharedItems/Shareables.h>
-#include <worklets/WorkletRuntime/WorkletRuntime.h>
-
-#include <jsi/jsi.h>
-
-#include <memory>
-#include <unordered_set>
-
-namespace reanimated {
-
-using namespace facebook;
-using namespace worklets;
-
-enum SensorType {
-  ACCELEROMETER = 1,
-  GYROSCOPE = 2,
-  GRAVITY = 3,
-  MAGNETIC_FIELD = 4,
-  ROTATION_VECTOR = 5,
-};
-
-class AnimatedSensorModule {
-  std::unordered_set<int> sensorsIds_;
-  RegisterSensorFunction platformRegisterSensorFunction_;
-  UnregisterSensorFunction platformUnregisterSensorFunction_;
-
- public:
-  AnimatedSensorModule(
-      const PlatformDepMethodsHolder &platformDepMethodsHolder);
-  ~AnimatedSensorModule();
-
-  jsi::Value registerSensor(
-      jsi::Runtime &rt,
-      const std::shared_ptr<WorkletRuntime> &uiWorkletRuntime,
-      const jsi::Value &sensorType,
-      const jsi::Value &interval,
-      const jsi::Value &iosReferenceFrame,
-      const jsi::Value &sensorDataContainer);
-  void unregisterSensor(const jsi::Value &sensorId);
-  void unregisterAllSensors();
-};
-
-} // namespace reanimated
+#pragma once
+
+#include <reanimated/Tools/PlatformDepMethodsHolder.h>
+
+#include <worklets/SharedItems/Shareables.h>
+#include <worklets/WorkletRuntime/WorkletRuntime.h>
+
+#include <jsi/jsi.h>
+
+#include <memory>
+#include <unordered_set>
+
+namespace reanimated {
+
+using namespace facebook;
+using namespace worklets;
+
+enum SensorType {
+  ACCELEROMETER = 1,
+  GYROSCOPE = 2,
+  GRAVITY = 3,
+  MAGNETIC_FIELD = 4,
+  ROTATION_VECTOR = 5,
+};
+
+class AnimatedSensorModule {
+  std::unordered_set<int> sensorsIds_;
+  RegisterSensorFunction platformRegisterSensorFunction_;
+  UnregisterSensorFunction platformUnregisterSensorFunction_;
+
+ public:
+  AnimatedSensorModule(
+      const PlatformDepMethodsHolder &platformDepMethodsHolder);
+  ~AnimatedSensorModule();
+
+  jsi::Value registerSensor(
+      jsi::Runtime &rt,
+      const std::shared_ptr<WorkletRuntime> &uiWorkletRuntime,
+      const jsi::Value &sensorType,
+      const jsi::Value &interval,
+      const jsi::Value &iosReferenceFrame,
+      const jsi::Value &sensorDataContainer);
+  void unregisterSensor(const jsi::Value &sensorId);
+  void unregisterAllSensors();
+};
+
+} // namespace reanimated

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/Fabric/PropsRegistry.cpp

@@ -1,68 +1,68 @@
-#ifdef RCT_NEW_ARCH_ENABLED
-
-#include <reanimated/Fabric/PropsRegistry.h>
-
-namespace reanimated {
-
-std::lock_guard<std::mutex> PropsRegistry::createLock() const {
-  return std::lock_guard<std::mutex>(mutex_);
-}
-
-void PropsRegistry::update(
-    const ShadowNode::Shared &shadowNode,
-    folly::dynamic &&props) {
-  const auto tag = shadowNode->getTag();
-  const auto it = map_.find(tag);
-  if (it == map_.cend()) {
-    // we need to store ShadowNode because `ShadowNode::getFamily`
-    // returns `ShadowNodeFamily const &` which is non-owning
-    map_[tag] = std::make_pair(shadowNode, props);
-  } else {
-    // no need to update `.first` because ShadowNode's family never changes
-    // merge new props with old props
-    it->second.second.update(props);
-  }
-}
-
-void PropsRegistry::for_each(std::function<void(
-                                 const ShadowNodeFamily &family,
-                                 const folly::dynamic &props)> callback) const {
-  for (const auto &[_, value] : map_) {
-    callback(value.first->getFamily(), value.second);
-  }
-}
-
-void PropsRegistry::markNodeAsRemovable(const ShadowNode::Shared &shadowNode) {
-  removableShadowNodes_[shadowNode->getTag()] = shadowNode;
-}
-
-void PropsRegistry::unmarkNodeAsRemovable(Tag viewTag) {
-  removableShadowNodes_.erase(viewTag);
-}
-
-void PropsRegistry::handleNodeRemovals(const RootShadowNode &rootShadowNode) {
-  for (auto it = removableShadowNodes_.begin();
-       it != removableShadowNodes_.end();) {
-    const auto &shadowNode = it->second;
-    const auto &family = shadowNode->getFamily();
-    const auto &ancestors = family.getAncestors(rootShadowNode);
-
-    // Skip if the node hasn't been removed
-    if (!ancestors.empty()) {
-      ++it;
-      continue;
-    }
-
-    const auto tag = shadowNode->getTag();
-    map_.erase(tag);
-    it = removableShadowNodes_.erase(it);
-  }
-}
-
-void PropsRegistry::remove(const Tag tag) {
-  map_.erase(tag);
-}
-
-} // namespace reanimated
-
-#endif // RCT_NEW_ARCH_ENABLED
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#include <reanimated/Fabric/PropsRegistry.h>
+
+namespace reanimated {
+
+std::lock_guard<std::mutex> PropsRegistry::createLock() const {
+  return std::lock_guard<std::mutex>(mutex_);
+}
+
+void PropsRegistry::update(
+    const ShadowNode::Shared &shadowNode,
+    folly::dynamic &&props) {
+  const auto tag = shadowNode->getTag();
+  const auto it = map_.find(tag);
+  if (it == map_.cend()) {
+    // we need to store ShadowNode because `ShadowNode::getFamily`
+    // returns `ShadowNodeFamily const &` which is non-owning
+    map_[tag] = std::make_pair(shadowNode, props);
+  } else {
+    // no need to update `.first` because ShadowNode's family never changes
+    // merge new props with old props
+    it->second.second.update(props);
+  }
+}
+
+void PropsRegistry::for_each(std::function<void(
+                                 const ShadowNodeFamily &family,
+                                 const folly::dynamic &props)> callback) const {
+  for (const auto &[_, value] : map_) {
+    callback(value.first->getFamily(), value.second);
+  }
+}
+
+void PropsRegistry::markNodeAsRemovable(const ShadowNode::Shared &shadowNode) {
+  removableShadowNodes_[shadowNode->getTag()] = shadowNode;
+}
+
+void PropsRegistry::unmarkNodeAsRemovable(Tag viewTag) {
+  removableShadowNodes_.erase(viewTag);
+}
+
+void PropsRegistry::handleNodeRemovals(const RootShadowNode &rootShadowNode) {
+  for (auto it = removableShadowNodes_.begin();
+       it != removableShadowNodes_.end();) {
+    const auto &shadowNode = it->second;
+    const auto &family = shadowNode->getFamily();
+    const auto &ancestors = family.getAncestors(rootShadowNode);
+
+    // Skip if the node hasn't been removed
+    if (!ancestors.empty()) {
+      ++it;
+      continue;
+    }
+
+    const auto tag = shadowNode->getTag();
+    map_.erase(tag);
+    it = removableShadowNodes_.erase(it);
+  }
+}
+
+void PropsRegistry::remove(const Tag tag) {
+  map_.erase(tag);
+}
+
+} // namespace reanimated
+
+#endif // RCT_NEW_ARCH_ENABLED