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

package/compatibility.json

@@ -0,0 +1,161 @@
+{
+  "fabric": {
+    "nightly": {
+      "react-native": ["0.80", "0.81", "0.82", "0.83"],
+      "react-native-worklets": ["nightly"]
+    },
+    "4.2.x": {
+      "react-native": ["0.80", "0.81", "0.82", "0.83"],
+      "react-native-worklets": ["0.7.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"]
+    },
+    "4.0.x": {
+      "react-native": ["0.78", "0.79", "0.80", "0.81"],
+      "react-native-worklets": ["0.4.x"]
+    },
+    "3.19.x": {
+      "react-native": ["0.78", "0.79", "0.80", "0.81"]
+    },
+    "3.18.x": {
+      "react-native": ["0.75", "0.76", "0.77", "0.78", "0.79", "0.80"]
+    },
+    "3.17.4 - 3.17.5": {
+      "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": {
+      "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"]
+    },
+    "3.9.x - 3.14.x": {
+      "react-native": ["0.74"]
+    },
+    "3.6.x - 3.8.x": {
+      "react-native": ["0.72", "0.73"]
+    },
+    "3.1.x - 3.5.x": {
+      "react-native": ["0.72"]
+    },
+    "3.0.x": {
+      "react-native": ["0.71"]
+    }
+  },
+  "paper": {
+    "3.19.x": {
+      "react-native": ["0.78", "0.79", "0.80", "0.81"]
+    },
+    "3.18.x": {
+      "react-native": ["0.75", "0.76", "0.77", "0.78", "0.79", "0.80"]
+    },
+    "3.17.4 - 3.17.5": {
+      "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": {
+      "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"]
+    },
+    "3.9.x - 3.14.x": {
+      "react-native": ["0.71", "0.72", "0.73", "0.74"]
+    },
+    "3.6.x - 3.8.x": {
+      "react-native": [
+        "0.66",
+        "0.67",
+        "0.68",
+        "0.69",
+        "0.70",
+        "0.71",
+        "0.72",
+        "0.73"
+      ]
+    },
+    "3.5.x": {
+      "react-native": ["0.66", "0.67", "0.68", "0.69", "0.70", "0.71", "0.72"]
+    },
+    "3.3.x - 3.4.x": {
+      "react-native": [
+        "0.63",
+        "0.64",
+        "0.65",
+        "0.66",
+        "0.67",
+        "0.68",
+        "0.69",
+        "0.70",
+        "0.71",
+        "0.72"
+      ]
+    },
+    "3.0.x - 3.2.x": {
+      "react-native": [
+        "0.63",
+        "0.64",
+        "0.65",
+        "0.66",
+        "0.67",
+        "0.68",
+        "0.69",
+        "0.70",
+        "0.71"
+      ]
+    },
+    "2.14.x - 2.17.x": {
+      "react-native": [
+        "0.63",
+        "0.64",
+        "0.65",
+        "0.66",
+        "0.67",
+        "0.68",
+        "0.69",
+        "0.70",
+        "0.71"
+      ]
+    },
+    "2.11.x - 2.13.x": {
+      "react-native": [
+        "0.63",
+        "0.64",
+        "0.65",
+        "0.66",
+        "0.67",
+        "0.68",
+        "0.69",
+        "0.70"
+      ]
+    },
+    "2.10.x": {
+      "react-native": ["0.63", "0.64", "0.65", "0.66", "0.67", "0.68", "0.69"]
+    },
+    "2.5.x - 2.9.x": {
+      "react-native": ["0.63", "0.64", "0.65", "0.66", "0.67", "0.68"]
+    },
+    "2.3.x - 2.4.x": {
+      "react-native": ["0.63", "0.64", "0.65", "0.66", "0.67"]
+    }
+  }
+}

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.1-rc.5';
+export const HAR_VERSION = '4.3.0-rc.1';
 export const BUILD_MODE_NAME = 'debug';
 export const DEBUG = true;
 export const TARGET_NAME = 'default';

package/harmony/reanimated/build-profile.json5

@@ -8,5 +8,12 @@
     {
       "name": "ohosTest",
     }
-  ]
+  ],
+//  "buildOptionSet": [{
+//    "externalNativeOptions": {
+//      "path": "./src/main/cpp/CMakeLists.txt",
+//      "arguments": ["-DREANIMATED_TEST=1"],
+//      "cppFlags": "-g",
+//    }
+//  }]
 }

package/harmony/reanimated/oh-package.json5

@@ -1,12 +1,13 @@
 {
   name: '@react-native-ohos/react-native-reanimated',
-  version: '3.18.1-rc.6',
+  version: '4.0.0-rc.1',
   description: "",
   type: 'module',
   main: 'index.ets',
   author: '',
   license: '',
   dependencies: {
-    "@rnoh/react-native-openharmony": "file:../react_native_openharmony.har",
+    "@rnoh/react-native-openharmony": "file:../../node_modules/@react-native-oh/react-native-harmony/react_native_openharmony.har",
+    "@react-native-ohos/react-native-worklets": "file:../worklets"
   },
 }

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

@@ -1,15 +1,20 @@
 cmake_minimum_required(VERSION 3.4.1)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_definitions(REANIMATED_VERSION=3.18.0)
-add_compile_definitions(JS_RUNTIME_HERMES=1)
+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(RCT_NEW_ARCH_ENABLED=1)
-add_compile_definitions(HERMES_ENABLE_DEBUGGER=0)
+add_compile_definitions(HERMES_ENABLE_DEBUGGER=1)
+add_compile_definitions(REACT_NATIVE_MINOR_VERSION=82)
 
 set(REANIMATED_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Common")
-set(PATCHES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/patches")
 
 file(GLOB rnoh_reanimated_SRC CONFIGURE_DEPENDS *.cpp)
+file(GLOB_RECURSE CSS_SRC
+  "${REANIMATED_SRC_DIR}/cpp/reanimated/CSS/**/*.cpp"
+)
+list(APPEND rnoh_reanimated_SRC ${CSS_SRC})
 
 add_library(rnoh_reanimated SHARED ${rnoh_reanimated_SRC})
 
@@ -17,56 +22,42 @@ target_include_directories(
   rnoh_reanimated
   PRIVATE
   "${REANIMATED_SRC_DIR}/cpp/reanimated/AnimatedSensor"
+  "${REANIMATED_SRC_DIR}/cpp/reanimated/CSS"
   "${REANIMATED_SRC_DIR}/cpp/reanimated/Fabric"
-  "${REANIMATED_SRC_DIR}/cpp/reanimated/hidden_headers"
   "${REANIMATED_SRC_DIR}/cpp/reanimated/LayoutAnimations"
   "${REANIMATED_SRC_DIR}/cpp/reanimated/NativeModules"
-  "${REANIMATED_SRC_DIR}/cpp/reanimated/ReanimatedRuntime"
-  "${REANIMATED_SRC_DIR}/cpp/worklets/Registries"
-  "${REANIMATED_SRC_DIR}/cpp/worklets/SharedItems"
   "${REANIMATED_SRC_DIR}/cpp/reanimated/Tools"
-  "${REANIMATED_SRC_DIR}/cpp/worklets/Tools"
-  "${REANIMATED_SRC_DIR}/cpp"
-  "${REANIMATED_SRC_DIR}/cpp/worklets/WorkletRuntime"
   "${REANIMATED_SRC_DIR}/cpp/reanimated/RuntimeDecorators"
+  "${REANIMATED_SRC_DIR}/cpp"
 )
 target_sources(rnoh_reanimated 
-  PRIVATE 
-  # BEGIN: patches
-  "${PATCHES_DIR}/Fabric/ShadowTreeCloner.cpp"
-  "${PATCHES_DIR}/NativeModules/ReanimatedModuleProxy.cpp"
-  "${PATCHES_DIR}/AnimatedSensor/AnimatedSensorModule.cpp"
-  # END: patches
-  "${REANIMATED_SRC_DIR}/cpp/reanimated/Fabric/PropsRegistry.cpp"
+  PRIVATE
+  "${REANIMATED_SRC_DIR}/cpp/reanimated/AnimatedSensor/AnimatedSensorModule.cpp"
+  "${REANIMATED_SRC_DIR}/cpp/reanimated/CSS/InterpolatorRegistry.cpp"
+  "${REANIMATED_SRC_DIR}/cpp/reanimated/Fabric/updates/AnimatedPropsRegistry.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"
   "${REANIMATED_SRC_DIR}/cpp/reanimated/Fabric/ReanimatedMountHook.cpp"
+  "${REANIMATED_SRC_DIR}/cpp/reanimated/Fabric/ShadowTreeCloner.cpp"
   "${REANIMATED_SRC_DIR}/cpp/reanimated/LayoutAnimations/LayoutAnimationsManager.cpp"
-  "${REANIMATED_SRC_DIR}/cpp/reanimated/LayoutAnimations/LayoutAnimationsProxy.cpp"
+  "${REANIMATED_SRC_DIR}/cpp/reanimated/LayoutAnimations/LayoutAnimationsProxy_Experimental.cpp"
+  "${REANIMATED_SRC_DIR}/cpp/reanimated/LayoutAnimations/LayoutAnimationsProxy_Legacy.cpp"
+  "${REANIMATED_SRC_DIR}/cpp/reanimated/LayoutAnimations/LayoutAnimationsProxyCommon.cpp"
   "${REANIMATED_SRC_DIR}/cpp/reanimated/LayoutAnimations/LayoutAnimationsUtils.cpp"
+  "${REANIMATED_SRC_DIR}/cpp/reanimated/LayoutAnimations/PropsDiffer.cpp"
+  "${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/RuntimeDecorators/RNRuntimeDecorator.cpp"
-  "${REANIMATED_SRC_DIR}/cpp/worklets/WorkletRuntime/ReanimatedHermesRuntime.cpp"
-  "${REANIMATED_SRC_DIR}/cpp/worklets/WorkletRuntime/ReanimatedRuntime.cpp"
-  "${REANIMATED_SRC_DIR}/cpp/worklets/WorkletRuntime/WorkletRuntime.cpp"
-  "${REANIMATED_SRC_DIR}/cpp/worklets/Registries/WorkletRuntimeRegistry.cpp"
-  "${REANIMATED_SRC_DIR}/cpp/worklets/Registries/EventHandlerRegistry.cpp"
-  "${REANIMATED_SRC_DIR}/cpp/worklets/SharedItems/Shareables.cpp"
-  "${REANIMATED_SRC_DIR}/cpp/worklets/Tools/AsyncQueue.cpp"
-  "${REANIMATED_SRC_DIR}/cpp/reanimated/Tools/FeaturesConfig.cpp"
-  "${REANIMATED_SRC_DIR}/cpp/worklets/Tools/JSISerializer.cpp"
-  "${REANIMATED_SRC_DIR}/cpp/worklets/Tools/JSLogger.cpp"
-  "${REANIMATED_SRC_DIR}/cpp/worklets/Tools/JSScheduler.cpp"
-  "${REANIMATED_SRC_DIR}/cpp/worklets/Tools/ReanimatedJSIUtils.cpp"
-  "${REANIMATED_SRC_DIR}/cpp/worklets/Tools/ReanimatedVersion.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/worklets/Tools/UIScheduler.cpp"
-  "${REANIMATED_SRC_DIR}/cpp/worklets/Tools/WorkletEventHandler.cpp"
-  "${REANIMATED_SRC_DIR}/cpp/worklets/NativeModules/WorkletsModuleProxy.cpp"
-  "${REANIMATED_SRC_DIR}/cpp/worklets/NativeModules/WorkletsModuleProxySpec.cpp"
-  "${REANIMATED_SRC_DIR}/cpp/worklets/WorkletRuntime/RNRuntimeWorkletDecorator.cpp"
-  "${REANIMATED_SRC_DIR}/cpp/worklets/WorkletRuntime/WorkletRuntimeDecorator.cpp"
+  "${REANIMATED_SRC_DIR}/cpp/reanimated/RuntimeDecorators/RNRuntimeDecorator.cpp"
   )
 
 target_include_directories(rnoh_reanimated PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(rnoh_reanimated PUBLIC rnoh_worklets)
 target_link_libraries(rnoh_reanimated PUBLIC rnoh)
-
+target_link_libraries(rnoh_reanimated PUBLIC libohsensor.so)
+target_link_libraries(rnoh_reanimated PUBLIC libnative_display_manager.so)

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

@@ -1,17 +1,17 @@
+#include <react/debug/react_native_assert.h>
 #include <reanimated/AnimatedSensor/AnimatedSensorModule.h>
 
+#include <memory>
 #include <utility>
 
 namespace reanimated {
 
-AnimatedSensorModule::AnimatedSensorModule(
-    const PlatformDepMethodsHolder &platformDepMethodsHolder)
+AnimatedSensorModule::AnimatedSensorModule(const PlatformDepMethodsHolder &platformDepMethodsHolder)
     : platformRegisterSensorFunction_(platformDepMethodsHolder.registerSensor),
-      platformUnregisterSensorFunction_(
-          platformDepMethodsHolder.unregisterSensor) {}
+      platformUnregisterSensorFunction_(platformDepMethodsHolder.unregisterSensor) {}
 
 AnimatedSensorModule::~AnimatedSensorModule() {
-  assert(sensorsIds_.empty());
+  react_native_assert(sensorsIds_.empty() && "Tried to deallocate AnimatedSensorModule with registered sensors");
 }
 
 jsi::Value AnimatedSensorModule::registerSensor(
@@ -23,18 +23,14 @@ jsi::Value AnimatedSensorModule::registerSensor(
     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.");
+  auto serializableHandler = extractSerializableOrThrow<SerializableWorklet>(
+      rt, sensorDataHandler, "[Reanimated] Sensor event handler must be a worklet.");
 
   int sensorId = platformRegisterSensorFunction_(
-      sensorType,
+      static_cast<int>(sensorType),
       interval.asNumber(),
       iosReferenceFrame.asNumber(),
-      [sensorType,
-       shareableHandler,
-       weakUiWorkletRuntime = std::weak_ptr<WorkletRuntime>(uiWorkletRuntime)](
+      [sensorType, serializableHandler, weakUiWorkletRuntime = std::weak_ptr<WorkletRuntime>(uiWorkletRuntime)](
           double newValues[], int orientationDegrees) {
         auto uiWorkletRuntime = weakUiWorkletRuntime.lock();
         if (uiWorkletRuntime == nullptr) {
@@ -59,10 +55,9 @@ jsi::Value AnimatedSensorModule::registerSensor(
           value.setProperty(uiRuntime, "y", newValues[1]);
           value.setProperty(uiRuntime, "z", newValues[2]);
         }
-        value.setProperty(
-            uiRuntime, "interfaceOrientation", orientationDegrees);
+        value.setProperty(uiRuntime, "interfaceOrientation", orientationDegrees);
 
-        uiWorkletRuntime->runGuarded(shareableHandler, value);
+        uiWorkletRuntime->runSync(serializableHandler, value);
       });
   if (sensorId != -1) {
     sensorsIds_.insert(sensorId);

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

@@ -2,7 +2,7 @@
 
 #include <reanimated/Tools/PlatformDepMethodsHolder.h>
 
-#include <worklets/SharedItems/Shareables.h>
+#include <worklets/SharedItems/Serializable.h>
 #include <worklets/WorkletRuntime/WorkletRuntime.h>
 
 #include <jsi/jsi.h>
@@ -15,7 +15,7 @@ namespace reanimated {
 using namespace facebook;
 using namespace worklets;
 
-enum SensorType {
+enum class SensorType : std::uint8_t {
   ACCELEROMETER = 1,
   GYROSCOPE = 2,
   GRAVITY = 3,
@@ -29,8 +29,7 @@ class AnimatedSensorModule {
   UnregisterSensorFunction platformUnregisterSensorFunction_;
 
  public:
-  AnimatedSensorModule(
-      const PlatformDepMethodsHolder &platformDepMethodsHolder);
+  explicit AnimatedSensorModule(const PlatformDepMethodsHolder &platformDepMethodsHolder);
   ~AnimatedSensorModule();
 
   jsi::Value registerSensor(