@react-native-ohos/react-native-reanimated 3.18.1-rc.6 → 4.0.0-rc.1

package/harmony/reanimated/src/main/cpp/Common/cpp/worklets/WorkletRuntime/WorkletRuntimeDecorator.cpp

@@ -1,182 +0,0 @@
-#include <worklets/SharedItems/Shareables.h>
-#include <worklets/Tools/JSISerializer.h>
-#include <worklets/Tools/PlatformLogger.h>
-#include <worklets/Tools/ReanimatedJSIUtils.h>
-#include <worklets/WorkletRuntime/WorkletRuntime.h>
-#include <worklets/WorkletRuntime/WorkletRuntimeDecorator.h>
-
-#include <vector>
-
-namespace worklets {
-
-static inline double performanceNow() {
-  // copied from JSExecutor.cpp
-  auto time = std::chrono::steady_clock::now();
-  auto duration = std::chrono::duration_cast<std::chrono::nanoseconds>(
-                      time.time_since_epoch())
-                      .count();
-
-  constexpr double NANOSECONDS_IN_MILLISECOND = 1000000.0;
-  return duration / NANOSECONDS_IN_MILLISECOND;
-}
-
-static inline std::vector<jsi::Value> parseArgs(
-    jsi::Runtime &rt,
-    std::shared_ptr<ShareableArray> shareableArgs) {
-  if (shareableArgs == nullptr) {
-    return {};
-  }
-
-  auto argsArray = shareableArgs->toJSValue(rt).asObject(rt).asArray(rt);
-  auto argsSize = argsArray.size(rt);
-  std::vector<jsi::Value> result(argsSize);
-  for (size_t i = 0; i < argsSize; i++) {
-    result[i] = argsArray.getValueAtIndex(rt, i);
-  }
-  return result;
-}
-
-void WorkletRuntimeDecorator::decorate(
-    jsi::Runtime &rt,
-    const std::string &name,
-    const std::shared_ptr<JSScheduler> &jsScheduler) {
-  // resolves "ReferenceError: Property 'global' doesn't exist at ..."
-  rt.global().setProperty(rt, "global", rt.global());
-
-  rt.global().setProperty(rt, "_WORKLET", true);
-
-  rt.global().setProperty(rt, "_LABEL", jsi::String::createFromAscii(rt, name));
-
-#ifdef RCT_NEW_ARCH_ENABLED
-  constexpr auto isFabric = true;
-#else
-  constexpr auto isFabric = false;
-#endif // RCT_NEW_ARCH_ENABLED
-  rt.global().setProperty(rt, "_IS_FABRIC", isFabric);
-
-#ifndef NDEBUG
-  auto evalWithSourceUrl = [](jsi::Runtime &rt,
-                              const jsi::Value &thisValue,
-                              const jsi::Value *args,
-                              size_t count) -> jsi::Value {
-    auto code = std::make_shared<const jsi::StringBuffer>(
-        args[0].asString(rt).utf8(rt));
-    std::string url;
-    if (count > 1 && args[1].isString()) {
-      url = args[1].asString(rt).utf8(rt);
-    }
-    return rt.evaluateJavaScript(code, url);
-  };
-  rt.global().setProperty(
-      rt,
-      "evalWithSourceUrl",
-      jsi::Function::createFromHostFunction(
-          rt,
-          jsi::PropNameID::forAscii(rt, "evalWithSourceUrl"),
-          1,
-          evalWithSourceUrl));
-#endif // NDEBUG
-
-  jsi_utils::installJsiFunction(
-      rt, "_log", [](jsi::Runtime &rt, const jsi::Value &value) {
-        PlatformLogger::log(stringifyJSIValue(rt, value));
-      });
-
-  jsi_utils::installJsiFunction(
-      rt, "_toString", [](jsi::Runtime &rt, const jsi::Value &value) {
-        return jsi::String::createFromUtf8(rt, stringifyJSIValue(rt, value));
-      });
-
-  jsi_utils::installJsiFunction(
-      rt,
-      "_makeShareableClone",
-      [](jsi::Runtime &rt,
-         const jsi::Value &value,
-         const jsi::Value &nativeStateSource) {
-        auto shouldRetainRemote = jsi::Value::undefined();
-        return makeShareableClone(
-            rt, value, shouldRetainRemote, nativeStateSource);
-      });
-
-  jsi_utils::installJsiFunction(
-      rt,
-      "_scheduleRemoteFunctionOnJS",
-      [jsScheduler](
-          jsi::Runtime &rt,
-          const jsi::Value &funValue,
-          const jsi::Value &argsValue) {
-        auto shareableRemoteFun = extractShareableOrThrow<
-            ShareableRemoteFunction>(
-            rt,
-            funValue,
-            "[Reanimated] Incompatible object passed to scheduleOnJS. It is only allowed to schedule worklets or functions defined on the React Native JS runtime this way.");
-
-        auto shareableArgs = argsValue.isUndefined()
-            ? nullptr
-            : extractShareableOrThrow<ShareableArray>(
-                  rt, argsValue, "[Reanimated] Args must be an array.");
-
-        jsScheduler->scheduleOnJS([=](jsi::Runtime &rt) {
-          auto fun =
-              shareableRemoteFun->toJSValue(rt).asObject(rt).asFunction(rt);
-          if (shareableArgs == nullptr) {
-            // fast path for remote function w/o arguments
-            fun.call(rt);
-          } else {
-            auto args = parseArgs(rt, shareableArgs);
-            fun.call(
-                rt, const_cast<const jsi::Value *>(args.data()), args.size());
-          }
-        });
-      });
-
-  jsi_utils::installJsiFunction(
-      rt,
-      "_scheduleHostFunctionOnJS",
-      [jsScheduler](
-          jsi::Runtime &rt,
-          const jsi::Value &hostFunValue,
-          const jsi::Value &argsValue) {
-        auto hostFun =
-            hostFunValue.asObject(rt).asFunction(rt).getHostFunction(rt);
-
-        auto shareableArgs = argsValue.isUndefined()
-            ? nullptr
-            : extractShareableOrThrow<ShareableArray>(
-                  rt, argsValue, "[Reanimated] Args must be an array.");
-
-        jsScheduler->scheduleOnJS([=](jsi::Runtime &rt) {
-          auto args = parseArgs(rt, shareableArgs);
-          hostFun(
-              rt,
-              jsi::Value::undefined(),
-              const_cast<const jsi::Value *>(args.data()),
-              args.size());
-        });
-      });
-
-  jsi_utils::installJsiFunction(
-      rt,
-      "_scheduleOnRuntime",
-      [](jsi::Runtime &rt,
-         const jsi::Value &workletRuntimeValue,
-         const jsi::Value &shareableWorkletValue) {
-        scheduleOnRuntime(rt, workletRuntimeValue, shareableWorkletValue);
-      });
-
-  jsi::Object performance(rt);
-  performance.setProperty(
-      rt,
-      "now",
-      jsi::Function::createFromHostFunction(
-          rt,
-          jsi::PropNameID::forAscii(rt, "now"),
-          0,
-          [](jsi::Runtime &runtime,
-             const jsi::Value &,
-             const jsi::Value *args,
-             size_t count) { return jsi::Value(performanceNow()); }));
-  rt.global().setProperty(rt, "performance", performance);
-}
-
-} // namespace worklets

package/harmony/reanimated/src/main/cpp/Common/cpp/worklets/WorkletRuntime/WorkletRuntimeDecorator.h

@@ -1,22 +0,0 @@
-#pragma once
-
-#include <worklets/Tools/JSScheduler.h>
-
-#include <jsi/jsi.h>
-
-#include <memory>
-#include <string>
-
-using namespace facebook;
-
-namespace worklets {
-
-class WorkletRuntimeDecorator {
- public:
-  static void decorate(
-      jsi::Runtime &rt,
-      const std::string &name,
-      const std::shared_ptr<JSScheduler> &jsScheduler);
-};
-
-} // namespace worklets

package/harmony/reanimated/src/main/cpp/ReanimatedLogger.cpp

@@ -1,33 +0,0 @@
-// 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.
-
-#include <PlatformLogger.h>
-#include "glog/logging.h"
-
-namespace worklets {
-void PlatformLogger::log(const char *str)
-{
-    LOG(INFO) << str;
-}
-
-void PlatformLogger::log(const std::string &str)
-{
-    log(str.c_str());
-}
-
-void PlatformLogger::log(const double d)
-{
-    LOG(INFO) << d;
-}
-
-void PlatformLogger::log(const int i)
-{
-    LOG(INFO) << i;
-}
-
-void PlatformLogger::log(const bool b)
-{
-    LOG(INFO) << b;
-}
-} // namespace worklets

package/harmony/reanimated/src/main/cpp/WorkletsModule.cpp

@@ -1,61 +0,0 @@
-// 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.
-
-#include "RNOH/ArkTSTurboModule.h"
-#include "ReanimatedUIScheduler.h"
-#include "WorkletsModule.h"
-#include "RNRuntimeWorkletDecorator.h"
-#include "PlatformLogger.h"
-
-using namespace facebook;
-namespace worklets {
-jsi::Value installTurboModule(facebook::jsi::Runtime &rt, react::TurboModule &turboModule,
-    const facebook::jsi::Value *args, size_t count)
-{
-    auto self = static_cast<WorkletsModule *>(&turboModule);
-    if (count < 1) {
-        LOG(ERROR) << "WorkletsModule: Missing required argument";
-        return facebook::jsi::Value(false);
-    }
-    if (!args[0].isString()) {
-        LOG(ERROR) << "WorkletsModule: First argument must be a string";
-        return facebook::jsi::Value(false);
-    }
-
-    std::string valueUnpackerCode = args[0].getString(rt).utf8(rt);
-    if (self == nullptr) { 
-        return facebook::jsi::Value::undefined();
-    }
-    self->installTurboModule(rt, valueUnpackerCode);
-    return facebook::jsi::Value(true);
-}
-
-WorkletsModule::WorkletsModule(const ArkTSTurboModule::Context ctx, const std::string name)
-    : ArkTSTurboModule(ctx, name)
-{
-    methodMap_ = { { "installTurboModule", { 0, worklets::installTurboModule } } };
-}
-
-WorkletsModule::~WorkletsModule()
-{
-    LOG(INFO) << "WorkletsModule::~WorkletsModule";
-}
-
-void WorkletsModule::installTurboModule(facebook::jsi::Runtime &runtime, std::string valueUnpackerCode)
-{
-    if (workletsModuleProxy_) {
-        LOG(WARNING) << "WorkletsModuleProxy already initialized";
-        return;
-    }
-
-    workletsModuleProxy_ = std::make_shared<WorkletsModuleProxy>(valueUnpackerCode, m_ctx.jsQueue, jsInvoker_,
-        std::make_shared<worklets::JSScheduler>(runtime, jsInvoker_),
-        std::make_shared<rnoh::ReanimatedUIScheduler>(m_ctx.taskExecutor));
-    RNRuntimeWorkletDecorator::decorate(runtime, workletsModuleProxy_);
-}
-std::shared_ptr<worklets::WorkletsModuleProxy> WorkletsModule::getWorkletsModuleProxy()
-{
-    return workletsModuleProxy_;
-}
-} // namespace worklets

package/harmony/reanimated/src/main/cpp/WorkletsModule.h

@@ -1,22 +0,0 @@
-// 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.
-
-#pragma once
-
-#include "RNOH/ArkTSTurboModule.h"
-#include "worklets/NativeModules/WorkletsModuleProxy.h"
-
-namespace worklets {
-
-class JSI_EXPORT WorkletsModule : public std::enable_shared_from_this<WorkletsModule>, public rnoh::ArkTSTurboModule {
-public:
-    WorkletsModule(const ArkTSTurboModule::Context ctx, const std::string name);
-    ~WorkletsModule() override;
-    void installTurboModule(facebook::jsi::Runtime &rt, const std::string valueUnpackerCode);
-    std::shared_ptr<worklets::WorkletsModuleProxy> getWorkletsModuleProxy();
-private:
-    std::shared_ptr<worklets::WorkletsModuleProxy> workletsModuleProxy_ = nullptr;
-};
-
-} // namespace worklets

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

@@ -1,89 +0,0 @@
-#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/Fabric/ShadowTreeCloner.cpp

@@ -1,95 +0,0 @@
-#ifdef RCT_NEW_ARCH_ENABLED
-
-#include <reanimated/Fabric/ShadowTreeCloner.h>
-
-#include <ranges>
-#include <utility>
-
-namespace reanimated {
-
-Props::Shared mergeProps(
-    const ShadowNode &shadowNode,
-    const PropsMap &propsMap,
-    const ShadowNodeFamily &family) {
-  const auto it = propsMap.find(&family);
-
-  if (it == propsMap.end()) {
-    return ShadowNodeFragment::propsPlaceholder();
-  }
-
-  PropsParserContext propsParserContext{
-      shadowNode.getSurfaceId(), *shadowNode.getContextContainer()};
-  const auto &propsVector = it->second;
-  auto newProps = shadowNode.getProps();
-
-#ifdef ANDROID
-  if (propsVector.size() > 1) {
-    folly::dynamic newPropsDynamic = folly::dynamic::object;
-    for (const auto &props : propsVector) {
-      newPropsDynamic = folly::dynamic::merge(
-          props.operator folly::dynamic(), newPropsDynamic);
-    }
-    return shadowNode.getComponentDescriptor().cloneProps(
-        propsParserContext, newProps, RawProps(newPropsDynamic));
-  }
-#endif
-
-  for (const auto &props : propsVector) {
-    newProps = shadowNode.getComponentDescriptor().cloneProps(
-        propsParserContext, newProps, RawProps(props));
-  }
-
-  return newProps;
-}
-
-ShadowNode::Unshared cloneShadowTreeWithNewPropsRecursive(
-    const ShadowNode &shadowNode,
-    const ChildrenMap &childrenMap,
-    const PropsMap &propsMap) {
-  const auto family = &shadowNode.getFamily();
-  const auto affectedChildrenIt = childrenMap.find(family);
-  auto children = shadowNode.getChildren();
-
-  if (affectedChildrenIt != childrenMap.end()) {
-    for (const auto index : affectedChildrenIt->second) {
-      children[index] = cloneShadowTreeWithNewPropsRecursive(
-          *children[index], childrenMap, propsMap);
-    }
-  }
-
-  return shadowNode.clone(
-      {mergeProps(shadowNode, propsMap, *family),
-       std::make_shared<ShadowNode::ListOfShared>(children),
-       shadowNode.getState()});
-}
-
-RootShadowNode::Unshared cloneShadowTreeWithNewProps(
-    const RootShadowNode &oldRootNode,
-    const PropsMap &propsMap) {
-  ChildrenMap childrenMap;
-
-  for (auto &[family, _] : propsMap) {
-    const auto ancestors = family->getAncestors(oldRootNode);
-        
-    for (auto it = ancestors.rbegin(); it != ancestors.rend(); ++it) {
-      const auto &[parentNode, index] = *it;
-      const auto parentFamily = &parentNode.get().getFamily();
-      auto &affectedChildren = childrenMap[parentFamily];
-
-      if (affectedChildren.contains(index)) {
-        continue;
-      }
-
-      affectedChildren.insert(index);
-    }
-  }
-
-  // This cast is safe, because this function returns a clone
-  // of the oldRootNode, which is an instance of RootShadowNode
-  return std::static_pointer_cast<RootShadowNode>(
-      cloneShadowTreeWithNewPropsRecursive(oldRootNode, childrenMap, propsMap));
-}
-
-} // namespace reanimated
-
-#endif // RCT_NEW_ARCH_ENABLED