@react-native-ohos/react-native-reanimated 4.0.2-beta.1 → 4.1.0-beta.1

package/compatibility.json

@@ -1,16 +1,28 @@
 {
   "fabric": {
     "nightly": {
-      "react-native": ["0.80", "0.81", "0.82", "0.83"],
+      "react-native": ["0.83", "0.84", "0.85", "0.86"],
       "react-native-worklets": ["nightly"]
     },
+    "4.5.x": {
+      "react-native": ["0.83", "0.84", "0.85", "0.86"],
+      "react-native-worklets": ["0.10.x", "0.11.x"]
+    },
+    "4.4.x": {
+      "react-native": ["0.83", "0.84", "0.85", "0.86"],
+      "react-native-worklets": ["0.9.x", "0.10.x"]
+    },
+    "4.3.x": {
+      "react-native": ["0.81", "0.82", "0.83", "0.84", "0.85"],
+      "react-native-worklets": ["0.8.x"]
+    },
     "4.2.x": {
-      "react-native": ["0.80", "0.81", "0.82", "0.83"],
-      "react-native-worklets": ["0.7.x"]
+      "react-native": ["0.80", "0.81", "0.82", "0.83", "0.84"],
+      "react-native-worklets": ["0.7.x", "0.8.x"]
     },
     "4.1.x": {
       "react-native": ["0.78", "0.79", "0.80", "0.81", "0.82"],
-      "react-native-worklets": ["0.5.x", "0.6.x"]
+      "react-native-worklets": ["0.5.x", "0.6.x", "0.7.x", "0.8.x"]
     },
     "4.0.x": {
       "react-native": ["0.78", "0.79", "0.80", "0.81"],
@@ -22,21 +34,12 @@
     "3.18.x": {
       "react-native": ["0.75", "0.76", "0.77", "0.78", "0.79", "0.80"]
     },
-    "3.17.4 - 3.17.5": {
+    "3.17.x": {
       "react-native": ["0.75", "0.76", "0.77", "0.78", "0.79"]
     },
-    "3.17.1 - 3.17.3": {
-      "react-native": ["0.75", "0.76", "0.77", "0.78"]
-    },
-    "3.17.0": {
-      "react-native": ["0.75", "0.76", "0.77"]
-    },
-    "3.16.7": {
+    "3.16.x": {
       "react-native": ["0.74", "0.75", "0.76", "0.77"]
     },
-    "3.16.0 - 3.16.6": {
-      "react-native": ["0.74", "0.75", "0.76"]
-    },
     "3.15.x": {
       "react-native": ["0.74", "0.75"]
     },
@@ -60,21 +63,12 @@
     "3.18.x": {
       "react-native": ["0.75", "0.76", "0.77", "0.78", "0.79", "0.80"]
     },
-    "3.17.4 - 3.17.5": {
+    "3.17.x": {
       "react-native": ["0.75", "0.76", "0.77", "0.78", "0.79"]
     },
-    "3.17.1 - 3.17.3": {
-      "react-native": ["0.75", "0.76", "0.77", "0.78"]
-    },
-    "3.17.0": {
-      "react-native": ["0.75", "0.76", "0.77"]
-    },
-    "3.16.7": {
+    "3.16.x": {
       "react-native": ["0.74", "0.75", "0.76", "0.77"]
     },
-    "3.16.0 - 3.16.6": {
-      "react-native": ["0.74", "0.75", "0.76"]
-    },
     "3.15.x": {
       "react-native": ["0.72", "0.73", "0.74", "0.75"]
     },

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 = '4.0.2-beta.1';
+export const HAR_VERSION = '4.1.0-beta.1';
 export const BUILD_MODE_NAME = 'debug';
 export const DEBUG = true;
 export const TARGET_NAME = 'default';

package/harmony/reanimated/index.ets

@@ -1,5 +1,7 @@
-// Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+// Copyright (c) 2026 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 './ts'
+import {  ReanimatedPackage } from './src/main/ets/ReanimatedPackage'
+export * from './ts'
+export default ReanimatedPackage

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

@@ -19,7 +19,7 @@
     },
     "@react-native-ohos/react-native-worklets@../../../../example/node_modules/@react-native-ohos/react-native-worklets/harmony/worklets.har": {
       "name": "@react-native-ohos/react-native-worklets",
-      "version": "1.0.1-rc.2",
+      "version": "1.1.0-beta.1",
       "resolved": "../../../../example/node_modules/@react-native-ohos/react-native-worklets/harmony/worklets.har",
       "registryType": "local",
       "dependencies": {

package/harmony/reanimated/oh-package.json5

@@ -1,6 +1,6 @@
 {
   name: '@react-native-ohos/react-native-reanimated',
-  version: '4.0.2-beta.1',
+  version: '4.1.0-beta.1',
   description: "",
   type: 'module',
   main: 'index.ets',

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

@@ -1,16 +1,18 @@
 cmake_minimum_required(VERSION 3.4.1)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_definitions(REANIMATED_VERSION=4.2.1)
-#add_compile_definitions(WORKLETS_VERSION=0.7.1)
-#add_compile_definitions(JS_RUNTIME_HERMES=1)
+add_compile_definitions(REANIMATED_VERSION=4.5.3)
 add_compile_definitions(RCT_NEW_ARCH_ENABLED=1)
-add_compile_definitions(REACT_NATIVE_MINOR_VERSION=82)
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    add_compile_definitions(HERMES_ENABLE_DEBUGGER=1)
-else()
-    add_compile_definitions(HERMES_ENABLE_DEBUGGER=0)
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+add_compile_definitions(_LIBCPP_ENABLE_EXPERIMENTAL)
+
+if(NOT DEFINED REANIMATED_FEATURE_FLAGS)
+  set(REANIMATED_FEATURE_FLAGS "[RUNTIME_TEST_FLAG:false][DISABLE_COMMIT_PAUSING_MECHANISM:false][ANDROID_SYNCHRONOUSLY_UPDATE_UI_PROPS:false][IOS_SYNCHRONOUSLY_UPDATE_UI_PROPS:false][EXPERIMENTAL_CSS_ANIMATIONS_FOR_SVG_COMPONENTS:false][IOS_CSS_CORE_ANIMATION:false][USE_SYNCHRONIZABLE_FOR_MUTABLES:false][USE_COMMIT_HOOK_ONLY_FOR_REACT_COMMITS:false][ENABLE_SHARED_ELEMENT_TRANSITIONS:false][FORCE_REACT_RENDER_FOR_SETTLED_ANIMATIONS:false][USE_ANIMATION_BACKEND:false]")
 endif()
+add_compile_definitions("REANIMATED_FEATURE_FLAGS=${REANIMATED_FEATURE_FLAGS}")
+
 set(REANIMATED_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Common")
 
 file(GLOB rnoh_reanimated_SRC CONFIGURE_DEPENDS *.cpp)
@@ -24,11 +26,18 @@ add_library(rnoh_reanimated SHARED ${rnoh_reanimated_SRC})
 target_include_directories(
   rnoh_reanimated
   PRIVATE
+  # hand-written replacement for the codegen-generated
+  # react/renderer/components/rnreanimated headers (see
+  # codegen/react/renderer/components/rnreanimated/Props.h)
+  "${CMAKE_CURRENT_SOURCE_DIR}/codegen"
   "${REANIMATED_SRC_DIR}/cpp/reanimated/AnimatedSensor"
   "${REANIMATED_SRC_DIR}/cpp/reanimated/CSS"
+  "${REANIMATED_SRC_DIR}/cpp/reanimated/Compat"
+  "${REANIMATED_SRC_DIR}/cpp/reanimated/Events"
   "${REANIMATED_SRC_DIR}/cpp/reanimated/Fabric"
   "${REANIMATED_SRC_DIR}/cpp/reanimated/LayoutAnimations"
   "${REANIMATED_SRC_DIR}/cpp/reanimated/NativeModules"
+  "${REANIMATED_SRC_DIR}/cpp/reanimated/PseudoStyles"
   "${REANIMATED_SRC_DIR}/cpp/reanimated/Tools"
   "${REANIMATED_SRC_DIR}/cpp/reanimated/RuntimeDecorators"
   "${REANIMATED_SRC_DIR}/cpp"
@@ -37,7 +46,10 @@ target_sources(rnoh_reanimated
   PRIVATE
   "${REANIMATED_SRC_DIR}/cpp/reanimated/AnimatedSensor/AnimatedSensorModule.cpp"
   "${REANIMATED_SRC_DIR}/cpp/reanimated/CSS/InterpolatorRegistry.cpp"
+  "${REANIMATED_SRC_DIR}/cpp/reanimated/Events/UIEventHandler.cpp"
+  "${REANIMATED_SRC_DIR}/cpp/reanimated/Events/UIEventHandlerRegistry.cpp"
   "${REANIMATED_SRC_DIR}/cpp/reanimated/Fabric/updates/AnimatedPropsRegistry.cpp"
+  "${REANIMATED_SRC_DIR}/cpp/reanimated/Fabric/updates/OperationsLoop.cpp"
   "${REANIMATED_SRC_DIR}/cpp/reanimated/Fabric/updates/UpdatesRegistry.cpp"
   "${REANIMATED_SRC_DIR}/cpp/reanimated/Fabric/updates/UpdatesRegistryManager.cpp"
   "${REANIMATED_SRC_DIR}/cpp/reanimated/Fabric/ReanimatedCommitHook.cpp"
@@ -52,11 +64,13 @@ target_sources(rnoh_reanimated
   "${REANIMATED_SRC_DIR}/cpp/reanimated/LayoutAnimations/SharedTransitions.cpp"
   "${REANIMATED_SRC_DIR}/cpp/reanimated/NativeModules/PropValueProcessor.cpp"
   "${REANIMATED_SRC_DIR}/cpp/reanimated/NativeModules/ReanimatedModuleProxy.cpp"
-  "${REANIMATED_SRC_DIR}/cpp/reanimated/NativeModules/ReanimatedModuleProxySpec.cpp"
+  "${REANIMATED_SRC_DIR}/cpp/reanimated/NativeModules/SynchronousPropsBufferSerializer.cpp"
+  "${REANIMATED_SRC_DIR}/cpp/reanimated/PseudoStyles/PseudoStylesRegistry.cpp"
   "${REANIMATED_SRC_DIR}/cpp/reanimated/Tools/FeatureFlags.cpp"
   "${REANIMATED_SRC_DIR}/cpp/reanimated/Tools/ReanimatedVersion.cpp"
   "${REANIMATED_SRC_DIR}/cpp/reanimated/RuntimeDecorators/UIRuntimeDecorator.cpp"
   "${REANIMATED_SRC_DIR}/cpp/reanimated/RuntimeDecorators/RNRuntimeDecorator.cpp"
+  "${REANIMATED_SRC_DIR}/NativeView/react/renderer/components/rnreanimated/REASharedTransitionBoundaryShadowNode.cpp"
   )
 
 target_include_directories(rnoh_reanimated PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

package/harmony/reanimated/src/main/cpp/Common/NativeView/CMakeLists.txt

@@ -0,0 +1,56 @@
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+#set(ANDROID_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../android)
+#set(CODEGEN_JNI_DIR ${ANDROID_DIR}/build/generated/source/codegen/jni)
+#set(CODEGEN_COMPONENTS_DIR ${CODEGEN_JNI_DIR}/react/renderer/components/rnreanimated)
+file(
+  GLOB CODEGEN_ORIGINAL_SRCS CONFIGURE_DEPENDS
+#  ${CODEGEN_JNI_DIR}/*.cpp
+  ${CODEGEN_COMPONENTS_DIR}/*.cpp
+)
+
+set(CODEGEN_OVERWRITTEN_JNI_DIR .)
+set(CODEGEN_OVERWRITTEN_COMPONENTS_DIR ${CODEGEN_OVERWRITTEN_JNI_DIR}/react/renderer/components/rnreanimated)
+file(
+  GLOB CODEGEN_OVERWRITTEN_SRCS CONFIGURE_DEPENDS
+  ${CODEGEN_OVERWRITTEN_JNI_DIR}/*.cpp
+  ${CODEGEN_OVERWRITTEN_COMPONENTS_DIR}/*.cpp
+)
+
+add_library(
+  react_codegen_rnreanimated
+  OBJECT
+  ${CODEGEN_OVERWRITTEN_SRCS}
+  ${CODEGEN_ORIGINAL_SRCS}
+)
+
+if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 80)
+  target_compile_reactnative_options(react_codegen_rnreanimated PRIVATE)
+endif()
+
+target_include_directories(
+  react_codegen_rnreanimated
+  PUBLIC
+  ${CODEGEN_OVERWRITTEN_JNI_DIR}
+  ${CODEGEN_OVERWRITTEN_COMPONENTS_DIR}
+#  ${CODEGEN_JNI_DIR}
+  ${CODEGEN_COMPONENTS_DIR}
+)
+
+target_link_libraries(
+  react_codegen_rnreanimated
+  fbjni
+  jsi
+  reactnative
+)
+
+target_compile_options(
+  react_codegen_rnreanimated
+  PRIVATE
+  -DLOG_TAG=\"ReactNative\"
+  -fexceptions
+  -frtti
+  -std=c++20
+  -Wall
+)

package/harmony/reanimated/src/main/cpp/Common/NativeView/react/renderer/components/rnreanimated/ComponentDescriptors.h

@@ -0,0 +1,19 @@
+
+/**
+ * This code was generated by
+ * [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be
+ * lost once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateComponentDescriptorsH.js
+ */
+
+#pragma once
+
+#include <react/renderer/components/rnreanimated/ShadowNodes.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
+#include "REASharedTransitionBoundaryComponentDescriptor.h"
+
+namespace facebook::react {} // namespace facebook::react

package/harmony/reanimated/src/main/cpp/Common/NativeView/react/renderer/components/rnreanimated/REASharedTransitionBoundaryComponentDescriptor.h

@@ -0,0 +1,30 @@
+
+/**
+ * This code was generated by
+ * [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be
+ * lost once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateComponentDescriptorH.js
+ */
+
+#pragma once
+
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
+#include "REASharedTransitionBoundaryShadowNode.h"
+
+namespace facebook::react {
+
+class REASharedTransitionBoundaryComponentDescriptor final
+    : public ConcreteComponentDescriptor<REASharedTransitionBoundaryShadowNode> {
+  using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
+  void adopt(ShadowNode &shadowNode) const override {
+    react_native_assert(dynamic_cast<REASharedTransitionBoundaryShadowNode *>(&shadowNode));
+
+    ConcreteComponentDescriptor::adopt(shadowNode);
+  }
+};
+
+} // namespace facebook::react

package/harmony/reanimated/src/main/cpp/Common/NativeView/react/renderer/components/rnreanimated/REASharedTransitionBoundaryShadowNode.cpp

@@ -0,0 +1,15 @@
+#include "REASharedTransitionBoundaryShadowNode.h"
+
+namespace facebook::react {
+
+extern const char REASharedTransitionBoundaryComponentName[] = "REASharedTransitionBoundary";
+
+void REASharedTransitionBoundaryShadowNode::initialize() {
+  // The boundary uses `display: contents` so it doesn't affect layout,
+  // but React would flatten such a view away. Unsetting this trait keeps
+  // the view in the native tree, so it shows up in mutations and can be
+  // tracked in the light tree.
+  traits_.unset(ShadowNodeTraits::ForceFlattenView);
+}
+
+} // namespace facebook::react

package/harmony/reanimated/src/main/cpp/Common/NativeView/react/renderer/components/rnreanimated/REASharedTransitionBoundaryShadowNode.h

@@ -0,0 +1,41 @@
+#pragma once
+
+#include <jsi/jsi.h>
+#include <react/renderer/components/rnreanimated/EventEmitters.h>
+#include <react/renderer/components/rnreanimated/Props.h>
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
+#include <react/renderer/core/LayoutContext.h>
+
+#include "REASharedTransitionBoundaryState.h"
+
+namespace facebook::react {
+
+JSI_EXPORT extern const char REASharedTransitionBoundaryComponentName[];
+
+/*
+ * `ShadowNode` for <REASharedTransitionBoundary> component.
+ */
+class REASharedTransitionBoundaryShadowNode final : public ConcreteViewShadowNode<
+                                                        REASharedTransitionBoundaryComponentName,
+                                                        REASharedTransitionBoundaryProps,
+                                                        REASharedTransitionBoundaryEventEmitter,
+                                                        REASharedTransitionBoundaryState> {
+ public:
+  REASharedTransitionBoundaryShadowNode(
+      const ShadowNodeFragment &fragment,
+      const ShadowNodeFamily::Shared &family,
+      ShadowNodeTraits traits)
+      : ConcreteViewShadowNode(fragment, family, traits) {
+    initialize();
+  }
+
+  REASharedTransitionBoundaryShadowNode(const ShadowNode &sourceShadowNode, const ShadowNodeFragment &fragment)
+      : ConcreteViewShadowNode(sourceShadowNode, fragment) {
+    initialize();
+  }
+
+ private:
+  void initialize();
+};
+
+} // namespace facebook::react

package/harmony/reanimated/src/main/cpp/Common/NativeView/react/renderer/components/rnreanimated/REASharedTransitionBoundaryState.h

@@ -0,0 +1,30 @@
+/**
+ * This code was generated by
+ * [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be
+ * lost once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#endif
+
+namespace facebook::react {
+
+class REASharedTransitionBoundaryState {
+ public:
+  REASharedTransitionBoundaryState() = default;
+
+#ifdef ANDROID
+  REASharedTransitionBoundaryState(REASharedTransitionBoundaryState const &previousState, folly::dynamic const &data) {}
+  folly::dynamic getDynamic() const {
+    return {};
+  }
+#endif
+};
+
+} // namespace facebook::react

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

@@ -10,12 +10,8 @@ AnimatedSensorModule::AnimatedSensorModule(const PlatformDepMethodsHolder &platf
     : platformRegisterSensorFunction_(platformDepMethodsHolder.registerSensor),
       platformUnregisterSensorFunction_(platformDepMethodsHolder.unregisterSensor) {}
 
-AnimatedSensorModule::~AnimatedSensorModule() {
-  react_native_assert(sensorsIds_.empty() && "Tried to deallocate AnimatedSensorModule with registered sensors");
-}
-
 jsi::Value AnimatedSensorModule::registerSensor(
-    jsi::Runtime &rt,
+    jsi::Runtime &rnRuntime,
     const std::shared_ptr<WorkletRuntime> &uiWorkletRuntime,
     const jsi::Value &sensorTypeValue,
     const jsi::Value &interval,
@@ -23,8 +19,11 @@ jsi::Value AnimatedSensorModule::registerSensor(
     const jsi::Value &sensorDataHandler) {
   SensorType sensorType = static_cast<SensorType>(sensorTypeValue.asNumber());
 
-  auto serializableHandler = extractSerializableOrThrow<SerializableWorklet>(
-      rt, sensorDataHandler, "[Reanimated] Sensor event handler must be a worklet.");
+  auto serializableHandler = extractSerializable(
+      rnRuntime,
+      sensorDataHandler,
+      "[Reanimated] Sensor event handler must be a worklet.",
+      Serializable::ValueType::WorkletType);
 
   int sensorId = platformRegisterSensorFunction_(
       static_cast<int>(sensorType),
@@ -37,7 +36,7 @@ jsi::Value AnimatedSensorModule::registerSensor(
           return;
         }
 
-        jsi::Runtime &uiRuntime = uiWorkletRuntime->getJSIRuntime();
+        jsi::Runtime &uiRuntime = getJSIRuntimeFromWorkletRuntime(uiWorkletRuntime);
         jsi::Object value(uiRuntime);
         if (sensorType == SensorType::ROTATION_VECTOR) {
           // TODO: timestamp should be provided by the platform implementation
@@ -57,7 +56,7 @@ jsi::Value AnimatedSensorModule::registerSensor(
         }
         value.setProperty(uiRuntime, "interfaceOrientation", orientationDegrees);
 
-        uiWorkletRuntime->runSync(serializableHandler, value);
+        runSyncOnRuntime(uiWorkletRuntime, serializableHandler, jsi::Value(uiRuntime, value));
       });
   if (sensorId != -1) {
     sensorsIds_.insert(sensorId);

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

@@ -1,10 +1,8 @@
 #pragma once
 
+#include <reanimated/Compat/WorkletsApi.h>
 #include <reanimated/Tools/PlatformDepMethodsHolder.h>
 
-#include <worklets/SharedItems/Serializable.h>
-#include <worklets/WorkletRuntime/WorkletRuntime.h>
-
 #include <jsi/jsi.h>
 
 #include <memory>
@@ -30,11 +28,10 @@ class AnimatedSensorModule {
 
  public:
   explicit AnimatedSensorModule(const PlatformDepMethodsHolder &platformDepMethodsHolder);
-  ~AnimatedSensorModule();
 
   jsi::Value registerSensor(
-      jsi::Runtime &rt,
-      const std::shared_ptr<WorkletRuntime> &uiWorkletRuntime,
+      jsi::Runtime &rnRuntime,
+      const std::shared_ptr<WorkletRuntime> &uiRuntime,
       const jsi::Value &sensorType,
       const jsi::Value &interval,
       const jsi::Value &iosReferenceFrame,