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

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/Tools/PlatformDepMethodsHolder.h

@@ -1,98 +1,98 @@
-#pragma once
-
-#include <jsi/jsi.h>
-
-#ifdef RCT_NEW_ARCH_ENABLED
-#include <react/renderer/core/ReactPrimitives.h>
-#endif
-
-#include <string>
-#include <utility>
-#include <vector>
-
-using namespace facebook;
-
-#ifdef RCT_NEW_ARCH_ENABLED
-using namespace react;
-#endif
-
-namespace reanimated {
-
-#ifdef RCT_NEW_ARCH_ENABLED
-
-using UpdatePropsFunction =
-    std::function<void(jsi::Runtime &rt, const jsi::Value &operations)>;
-using ObtainPropFunction = std::function<jsi::Value(
-    jsi::Runtime &rt,
-    const jsi::Value &shadowNodeWrapper,
-    const jsi::Value &propName)>;
-using DispatchCommandFunction = std::function<void(
-    jsi::Runtime &rt,
-    const jsi::Value &shadowNodeValue,
-    const jsi::Value &commandNameValue,
-    const jsi::Value &argsValue)>;
-using MeasureFunction = std::function<
-    jsi::Value(jsi::Runtime &rt, const jsi::Value &shadowNodeValue)>;
-
-#else
-
-using UpdatePropsFunction =
-    std::function<void(jsi::Runtime &rt, const jsi::Value &operations)>;
-using ScrollToFunction = std::function<void(int, double, double, bool)>;
-using DispatchCommandFunction = std::function<void(
-    jsi::Runtime &rt,
-    const int viewTag,
-    const jsi::Value &commandNameValue,
-    const jsi::Value &argsValue)>;
-using MeasureFunction =
-    std::function<std::vector<std::pair<std::string, double>>(int)>;
-using ObtainPropFunction =
-    std::function<jsi::Value(jsi::Runtime &, const int, const jsi::Value &)>;
-
-#endif // RCT_NEW_ARCH_ENABLED
-
-using RequestRenderFunction =
-    std::function<void(std::function<void(const double)>)>;
-using GetAnimationTimestampFunction = std::function<double(void)>;
-
-using ProgressLayoutAnimationFunction =
-    std::function<void(jsi::Runtime &, int, jsi::Object, bool)>;
-using EndLayoutAnimationFunction = std::function<void(int, bool)>;
-
-using RegisterSensorFunction =
-    std::function<int(int, int, int, std::function<void(double[], int)>)>;
-using UnregisterSensorFunction = std::function<void(int)>;
-using SetGestureStateFunction = std::function<void(int, int)>;
-using ConfigurePropsFunction = std::function<void(
-    jsi::Runtime &rt,
-    const jsi::Value &uiProps,
-    const jsi::Value &nativeProps)>;
-using KeyboardEventSubscribeFunction =
-    std::function<int(std::function<void(int, int)>, bool, bool)>;
-using KeyboardEventUnsubscribeFunction = std::function<void(int)>;
-using MaybeFlushUIUpdatesQueueFunction = std::function<void()>;
-
-struct PlatformDepMethodsHolder {
-  RequestRenderFunction requestRender;
-#ifdef RCT_NEW_ARCH_ENABLED
-  // nothing
-#else
-  UpdatePropsFunction updatePropsFunction;
-  ScrollToFunction scrollToFunction;
-  DispatchCommandFunction dispatchCommandFunction;
-  MeasureFunction measureFunction;
-  ConfigurePropsFunction configurePropsFunction;
-  ObtainPropFunction obtainPropFunction;
-#endif
-  GetAnimationTimestampFunction getAnimationTimestamp;
-  ProgressLayoutAnimationFunction progressLayoutAnimation;
-  EndLayoutAnimationFunction endLayoutAnimation;
-  RegisterSensorFunction registerSensor;
-  UnregisterSensorFunction unregisterSensor;
-  SetGestureStateFunction setGestureStateFunction;
-  KeyboardEventSubscribeFunction subscribeForKeyboardEvents;
-  KeyboardEventUnsubscribeFunction unsubscribeFromKeyboardEvents;
-  MaybeFlushUIUpdatesQueueFunction maybeFlushUIUpdatesQueueFunction;
-};
-
-} // namespace reanimated
+#pragma once
+
+#include <jsi/jsi.h>
+
+#ifdef RCT_NEW_ARCH_ENABLED
+#include <react/renderer/core/ReactPrimitives.h>
+#endif
+
+#include <string>
+#include <utility>
+#include <vector>
+
+using namespace facebook;
+
+#ifdef RCT_NEW_ARCH_ENABLED
+using namespace react;
+#endif
+
+namespace reanimated {
+
+#ifdef RCT_NEW_ARCH_ENABLED
+
+using UpdatePropsFunction =
+    std::function<void(jsi::Runtime &rt, const jsi::Value &operations)>;
+using ObtainPropFunction = std::function<jsi::Value(
+    jsi::Runtime &rt,
+    const jsi::Value &shadowNodeWrapper,
+    const jsi::Value &propName)>;
+using DispatchCommandFunction = std::function<void(
+    jsi::Runtime &rt,
+    const jsi::Value &shadowNodeValue,
+    const jsi::Value &commandNameValue,
+    const jsi::Value &argsValue)>;
+using MeasureFunction = std::function<
+    jsi::Value(jsi::Runtime &rt, const jsi::Value &shadowNodeValue)>;
+
+#else
+
+using UpdatePropsFunction =
+    std::function<void(jsi::Runtime &rt, const jsi::Value &operations)>;
+using ScrollToFunction = std::function<void(int, double, double, bool)>;
+using DispatchCommandFunction = std::function<void(
+    jsi::Runtime &rt,
+    const int viewTag,
+    const jsi::Value &commandNameValue,
+    const jsi::Value &argsValue)>;
+using MeasureFunction =
+    std::function<std::vector<std::pair<std::string, double>>(int)>;
+using ObtainPropFunction =
+    std::function<jsi::Value(jsi::Runtime &, const int, const jsi::Value &)>;
+
+#endif // RCT_NEW_ARCH_ENABLED
+
+using RequestRenderFunction =
+    std::function<void(std::function<void(const double)>)>;
+using GetAnimationTimestampFunction = std::function<double(void)>;
+
+using ProgressLayoutAnimationFunction =
+    std::function<void(jsi::Runtime &, int, jsi::Object, bool)>;
+using EndLayoutAnimationFunction = std::function<void(int, bool)>;
+
+using RegisterSensorFunction =
+    std::function<int(int, int, int, std::function<void(double[], int)>)>;
+using UnregisterSensorFunction = std::function<void(int)>;
+using SetGestureStateFunction = std::function<void(int, int)>;
+using ConfigurePropsFunction = std::function<void(
+    jsi::Runtime &rt,
+    const jsi::Value &uiProps,
+    const jsi::Value &nativeProps)>;
+using KeyboardEventSubscribeFunction =
+    std::function<int(std::function<void(int, int)>, bool, bool)>;
+using KeyboardEventUnsubscribeFunction = std::function<void(int)>;
+using MaybeFlushUIUpdatesQueueFunction = std::function<void()>;
+
+struct PlatformDepMethodsHolder {
+  RequestRenderFunction requestRender;
+#ifdef RCT_NEW_ARCH_ENABLED
+  // nothing
+#else
+  UpdatePropsFunction updatePropsFunction;
+  ScrollToFunction scrollToFunction;
+  DispatchCommandFunction dispatchCommandFunction;
+  MeasureFunction measureFunction;
+  ConfigurePropsFunction configurePropsFunction;
+  ObtainPropFunction obtainPropFunction;
+#endif
+  GetAnimationTimestampFunction getAnimationTimestamp;
+  ProgressLayoutAnimationFunction progressLayoutAnimation;
+  EndLayoutAnimationFunction endLayoutAnimation;
+  RegisterSensorFunction registerSensor;
+  UnregisterSensorFunction unregisterSensor;
+  SetGestureStateFunction setGestureStateFunction;
+  KeyboardEventSubscribeFunction subscribeForKeyboardEvents;
+  KeyboardEventUnsubscribeFunction unsubscribeFromKeyboardEvents;
+  MaybeFlushUIUpdatesQueueFunction maybeFlushUIUpdatesQueueFunction;
+};
+
+} // namespace reanimated

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/Tools/ReanimatedSystraceSection.h

@@ -1,135 +1,135 @@
-#pragma once
-#include <string>
-#include <vector>
-
-#ifdef REANIMATED_PROFILING
-
-#if defined(__APPLE__)
-#include <os/trace_base.h>
-
-#if OS_LOG_TARGET_HAS_10_15_FEATURES
-#include <os/log.h>
-#include <os/signpost.h>
-#include <sstream>
-#endif // OS_LOG_TARGET_HAS_10_15_FEATURES
-
-#elif defined(ANDROID)
-
-#include <android/trace.h>
-
-#endif // defined(ANDROID)
-
-#endif // REANIMATED_PROFILING
-
-namespace reanimated {
-
-#if defined(ANDROID) && defined(REANIMATED_PROFILING)
-
-struct ReanimatedSystraceSection {
- public:
-  template <typename... ConvertsToStringPiece>
-  explicit ReanimatedSystraceSection(
-      const char *name,
-      ConvertsToStringPiece &&...args) {
-    ATrace_beginSection(name);
-  }
-
-  ~ReanimatedSystraceSection() {
-    ATrace_endSection();
-  }
-};
-
-// The apple part is copied from React Native
-// from
-// https://github.com/facebook/react-native/blob/5697d923a05119314b4cfcd556cb243986637764/packages/react-native/ReactCommon/cxxreact/SystraceSection.h
-#elif defined(__APPLE__) && OS_LOG_TARGET_HAS_10_15_FEATURES && \
-    defined(REANIMATED_PROFILING)
-
-template <typename T, typename = void>
-struct renderer {
-  static std::string render(const T &t) {
-    std::ostringstream oss;
-    oss << t;
-    return oss.str();
-  }
-};
-
-template <typename T>
-static auto render(const T &t)
-    -> decltype(renderer<T>::render(std::declval<const T &>())) {
-  return renderer<T>::render(t);
-}
-
-inline os_log_t instrumentsLogHandle = nullptr;
-
-static inline os_log_t getOrCreateInstrumentsLogHandle() {
-  if (!instrumentsLogHandle) {
-    instrumentsLogHandle = os_log_create(
-        "dev.reanimated.instruments", OS_LOG_CATEGORY_POINTS_OF_INTEREST);
-  }
-  return instrumentsLogHandle;
-}
-
-struct ReanimatedSystraceSection {
- public:
-  template <typename... ConvertsToStringPiece>
-  explicit ReanimatedSystraceSection(
-      const char *name,
-      ConvertsToStringPiece &&...args) {
-    os_log_t instrumentsLogHandle =
-        reanimated::getOrCreateInstrumentsLogHandle();
-
-    // If the log isn't enabled, we don't want the performance overhead of the
-    // rest of the code below.
-    if (!os_signpost_enabled(instrumentsLogHandle)) {
-      return;
-    }
-
-    name_ = name;
-
-    const auto argsVector =
-        std::vector<std::string>{reanimated::render(args)...};
-    std::string argsString = "";
-    for (size_t i = 0; i < argsVector.size(); i += 2) {
-      argsString += argsVector[i] + "=" + argsVector[i + 1] + ";";
-    }
-
-    signpostID_ = os_signpost_id_make_with_pointer(instrumentsLogHandle, this);
-
-    os_signpost_interval_begin(
-        instrumentsLogHandle,
-        signpostID_,
-        "Reanimated",
-        "%s begin: %s",
-        name,
-        argsString.c_str());
-  }
-
-  ~ReanimatedSystraceSection() {
-    os_signpost_interval_end(
-        reanimated::instrumentsLogHandle,
-        signpostID_,
-        "Reanimated",
-        "%s end",
-        name_.data());
-  }
-
- private:
-  os_signpost_id_t signpostID_ = OS_SIGNPOST_ID_INVALID;
-  std::string_view name_;
-};
-
-#else
-
-struct ReanimatedSystraceSection {
- public:
-  template <typename... ConvertsToStringPiece>
-  explicit ReanimatedSystraceSection(
-      const char *name,
-      ConvertsToStringPiece &&...args) {}
-};
-
-#endif // defined(__APPLE__) && OS_LOG_TARGET_HAS_10_15_FEATURES &&
-       // defined(REANIMATED_PROFILING)
-
-} // namespace reanimated
+#pragma once
+#include <string>
+#include <vector>
+
+#ifdef REANIMATED_PROFILING
+
+#if defined(__APPLE__)
+#include <os/trace_base.h>
+
+#if OS_LOG_TARGET_HAS_10_15_FEATURES
+#include <os/log.h>
+#include <os/signpost.h>
+#include <sstream>
+#endif // OS_LOG_TARGET_HAS_10_15_FEATURES
+
+#elif defined(ANDROID)
+
+#include <android/trace.h>
+
+#endif // defined(ANDROID)
+
+#endif // REANIMATED_PROFILING
+
+namespace reanimated {
+
+#if defined(ANDROID) && defined(REANIMATED_PROFILING)
+
+struct ReanimatedSystraceSection {
+ public:
+  template <typename... ConvertsToStringPiece>
+  explicit ReanimatedSystraceSection(
+      const char *name,
+      ConvertsToStringPiece &&...args) {
+    ATrace_beginSection(name);
+  }
+
+  ~ReanimatedSystraceSection() {
+    ATrace_endSection();
+  }
+};
+
+// The apple part is copied from React Native
+// from
+// https://github.com/facebook/react-native/blob/5697d923a05119314b4cfcd556cb243986637764/packages/react-native/ReactCommon/cxxreact/SystraceSection.h
+#elif defined(__APPLE__) && OS_LOG_TARGET_HAS_10_15_FEATURES && \
+    defined(REANIMATED_PROFILING)
+
+template <typename T, typename = void>
+struct renderer {
+  static std::string render(const T &t) {
+    std::ostringstream oss;
+    oss << t;
+    return oss.str();
+  }
+};
+
+template <typename T>
+static auto render(const T &t)
+    -> decltype(renderer<T>::render(std::declval<const T &>())) {
+  return renderer<T>::render(t);
+}
+
+inline os_log_t instrumentsLogHandle = nullptr;
+
+static inline os_log_t getOrCreateInstrumentsLogHandle() {
+  if (!instrumentsLogHandle) {
+    instrumentsLogHandle = os_log_create(
+        "dev.reanimated.instruments", OS_LOG_CATEGORY_POINTS_OF_INTEREST);
+  }
+  return instrumentsLogHandle;
+}
+
+struct ReanimatedSystraceSection {
+ public:
+  template <typename... ConvertsToStringPiece>
+  explicit ReanimatedSystraceSection(
+      const char *name,
+      ConvertsToStringPiece &&...args) {
+    os_log_t instrumentsLogHandle =
+        reanimated::getOrCreateInstrumentsLogHandle();
+
+    // If the log isn't enabled, we don't want the performance overhead of the
+    // rest of the code below.
+    if (!os_signpost_enabled(instrumentsLogHandle)) {
+      return;
+    }
+
+    name_ = name;
+
+    const auto argsVector =
+        std::vector<std::string>{reanimated::render(args)...};
+    std::string argsString = "";
+    for (size_t i = 0; i < argsVector.size(); i += 2) {
+      argsString += argsVector[i] + "=" + argsVector[i + 1] + ";";
+    }
+
+    signpostID_ = os_signpost_id_make_with_pointer(instrumentsLogHandle, this);
+
+    os_signpost_interval_begin(
+        instrumentsLogHandle,
+        signpostID_,
+        "Reanimated",
+        "%s begin: %s",
+        name,
+        argsString.c_str());
+  }
+
+  ~ReanimatedSystraceSection() {
+    os_signpost_interval_end(
+        reanimated::instrumentsLogHandle,
+        signpostID_,
+        "Reanimated",
+        "%s end",
+        name_.data());
+  }
+
+ private:
+  os_signpost_id_t signpostID_ = OS_SIGNPOST_ID_INVALID;
+  std::string_view name_;
+};
+
+#else
+
+struct ReanimatedSystraceSection {
+ public:
+  template <typename... ConvertsToStringPiece>
+  explicit ReanimatedSystraceSection(
+      const char *name,
+      ConvertsToStringPiece &&...args) {}
+};
+
+#endif // defined(__APPLE__) && OS_LOG_TARGET_HAS_10_15_FEATURES &&
+       // defined(REANIMATED_PROFILING)
+
+} // namespace reanimated

package/harmony/reanimated/src/main/cpp/Common/cpp/worklets/NativeModules/WorkletsModuleProxy.cpp

@@ -1,47 +1,47 @@
-#include <string>
-
-#ifdef RCT_NEW_ARCH_ENABLED
-#include <react/renderer/uimanager/UIManagerBinding.h>
-#include <react/renderer/uimanager/primitives.h>
-#endif // RCT_NEW_ARCH_ENABLED
-
-#include <worklets/NativeModules/WorkletsModuleProxy.h>
-#include <worklets/SharedItems/Shareables.h>
-#include <worklets/Tools/Defs.h>
-
-#ifdef __ANDROID__
-#include <fbjni/fbjni.h>
-#endif // __ANDROID__
-
-#include <jsi/jsi.h>
-
-using namespace facebook;
-
-namespace worklets {
-
-WorkletsModuleProxy::WorkletsModuleProxy(
-    const std::string &valueUnpackerCode,
-    const std::shared_ptr<MessageQueueThread> &jsQueue,
-    const std::shared_ptr<CallInvoker> &jsCallInvoker,
-    const std::shared_ptr<JSScheduler> &jsScheduler,
-    const std::shared_ptr<UIScheduler> &uiScheduler)
-    : WorkletsModuleProxySpec(jsCallInvoker),
-      valueUnpackerCode_(valueUnpackerCode),
-      jsQueue_(jsQueue),
-      jsScheduler_(jsScheduler),
-      uiScheduler_(uiScheduler) {}
-
-WorkletsModuleProxy::~WorkletsModuleProxy() {}
-
-jsi::Value WorkletsModuleProxy::makeShareableClone(
-    jsi::Runtime &rt,
-    const jsi::Value &value,
-    const jsi::Value &shouldRetainRemote,
-    const jsi::Value &nativeStateSource) {
-  // TODO: It might be a good idea to rename one of these methods to avoid
-  // confusion.
-  return worklets::makeShareableClone(
-      rt, value, shouldRetainRemote, nativeStateSource);
-}
-
-} // namespace worklets
+#include <string>
+
+#ifdef RCT_NEW_ARCH_ENABLED
+#include <react/renderer/uimanager/UIManagerBinding.h>
+#include <react/renderer/uimanager/primitives.h>
+#endif // RCT_NEW_ARCH_ENABLED
+
+#include <worklets/NativeModules/WorkletsModuleProxy.h>
+#include <worklets/SharedItems/Shareables.h>
+#include <worklets/Tools/Defs.h>
+
+#ifdef __ANDROID__
+#include <fbjni/fbjni.h>
+#endif // __ANDROID__
+
+#include <jsi/jsi.h>
+
+using namespace facebook;
+
+namespace worklets {
+
+WorkletsModuleProxy::WorkletsModuleProxy(
+    const std::string &valueUnpackerCode,
+    const std::shared_ptr<MessageQueueThread> &jsQueue,
+    const std::shared_ptr<CallInvoker> &jsCallInvoker,
+    const std::shared_ptr<JSScheduler> &jsScheduler,
+    const std::shared_ptr<UIScheduler> &uiScheduler)
+    : WorkletsModuleProxySpec(jsCallInvoker),
+      valueUnpackerCode_(valueUnpackerCode),
+      jsQueue_(jsQueue),
+      jsScheduler_(jsScheduler),
+      uiScheduler_(uiScheduler) {}
+
+WorkletsModuleProxy::~WorkletsModuleProxy() {}
+
+jsi::Value WorkletsModuleProxy::makeShareableClone(
+    jsi::Runtime &rt,
+    const jsi::Value &value,
+    const jsi::Value &shouldRetainRemote,
+    const jsi::Value &nativeStateSource) {
+  // TODO: It might be a good idea to rename one of these methods to avoid
+  // confusion.
+  return worklets::makeShareableClone(
+      rt, value, shouldRetainRemote, nativeStateSource);
+}
+
+} // namespace worklets