Merge

.eslintrc.js

@@ -33,12 +33,13 @@ module.exports = {
   },
   rules: {
     curly: 'error',
+    'no-case-declarations': 'error',
+    '@typescript-eslint/no-shadow': 'error',
     'import/no-unresolved': 'error',
     'import/consistent-type-specifier-style': ['error', 'prefer-top-level'],
     'react/jsx-uses-vars': 'error',
     'react/jsx-uses-react': 'error',
     'no-use-before-define': 'off',
-    '@typescript-eslint/no-use-before-define': 'off', // TODO consider enabling this (currently it reports styles defined at the bottom of the file)
     '@typescript-eslint/ban-ts-comment': [
       'error',
       {
@@ -60,5 +61,6 @@ module.exports = {
       { fixMixedExportsWithInlineTypeSpecifier: false },
     ],
     'tsdoc/syntax': 'error',
+    '@typescript-eslint/no-non-null-assertion': 'off',
   },
 };

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -1,6 +1,5 @@
 name: Bug report
 description: Report an issue with Reanimated here.
-labels: 'Needs review'
 body:
   - type: markdown
     attributes:
@@ -57,7 +56,7 @@ body:
     attributes:
       label: Reanimated version
       description: What version of react-native-reanimated are you using?
-      placeholder: 2.9.0
+      placeholder: 3.6.1
     validations:
       required: true
 
@@ -66,7 +65,7 @@ body:
     attributes:
       label: React Native version
       description: What version of react-native are you using?
-      placeholder: 0.69.0
+      placeholder: 0.73.1
     validations:
       required: true
 

.github/workflows/build-monorepo-action.yml

@@ -26,6 +26,11 @@ jobs:
       group: ${{ inputs.concurrency_group }}
       cancel-in-progress: true
     steps:
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '17'
       - name: Create directories
         run: mkdir -p monorepo/packages
       - name: Create RootApp
@@ -63,11 +68,11 @@ jobs:
       - name: Build iOS app RootApp
         if: ${{ inputs.platform == 'iOS' }}
         working-directory: monorepo/RootApp
-        run: yarn react-native run-ios --simulator='iPhone 14'
+        run: yarn react-native run-ios --simulator='iPhone 14' --no-packager
       - name: Build iOS app PackageApp
         if: ${{ inputs.platform == 'iOS' }}
         working-directory: monorepo/packages/PackageApp
-        run: yarn react-native run-ios --simulator='iPhone 14'
+        run: yarn react-native run-ios --simulator='iPhone 14' --no-packager
 
       - name: Build Android RootApp
         if: ${{ inputs.platform == 'Android' }}

.github/workflows/build-on-windows-nightly.yml

@@ -15,11 +15,11 @@ jobs:
       group: build-on-windows-${{ github.ref }}
       cancel-in-progress: true
     steps:
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
       - name: Create React Native App
         run: npx react-native init App
       - name: Install Reanimated

.github/workflows/check-static-framework-nightly.yml

@@ -34,4 +34,4 @@ jobs:
         run: export USE_FRAMEWORKS=static NO_FLIPPER=1 RCT_NEW_ARCH_ENABLED=1 && pod install
       - name: Build app
         working-directory: app
-        run: npx react-native run-ios
+        run: npx react-native run-ios --no-packager

.github/workflows/format-pull-request-description.yml

@@ -0,0 +1,18 @@
+name: Format Pull Request Description
+
+on:
+  pull_request:
+    types:
+      - opened
+
+jobs:
+  format-pull-request-description:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Update PR Description
+        uses: software-mansion-labs/pr-description@main
+        with:
+          content: ""
+          regex: "<!-- .* -->\n"
+          regexFlags: img
+          token: ${{ secrets.GITHUB_TOKEN }}

Common/cpp/LayoutAnimations/LayoutAnimationsManager.cpp

@@ -27,6 +27,18 @@ void LayoutAnimationsManager::configureAnimation(
   }
 }
 
+void LayoutAnimationsManager::configureAnimationBatch(
+    std::vector<LayoutAnimationConfig> &layoutAnimationsBatch) {
+  auto lock = std::unique_lock<std::mutex>(animationsMutex_);
+  for (auto [tag, type, config] : layoutAnimationsBatch) {
+    if (config == nullptr) {
+      getConfigsForType(type).erase(tag);
+    } else {
+      getConfigsForType(type)[tag] = config;
+    }
+  }
+}
+
 void LayoutAnimationsManager::setShouldAnimateExiting(int tag, bool value) {
   auto lock = std::unique_lock<std::mutex>(animationsMutex_);
   shouldAnimateExitingForTag_[tag] = value;

Common/cpp/LayoutAnimations/LayoutAnimationsManager.h

@@ -18,6 +18,12 @@ namespace reanimated {
 
 using namespace facebook;
 
+struct LayoutAnimationConfig {
+  int tag;
+  LayoutAnimationType type;
+  std::shared_ptr<Shareable> config;
+};
+
 class LayoutAnimationsManager {
  public:
   explicit LayoutAnimationsManager(const std::shared_ptr<JSLogger> &jsLogger)
@@ -27,6 +33,8 @@ class LayoutAnimationsManager {
       LayoutAnimationType type,
       const std::string &sharedTransitionTag,
       std::shared_ptr<Shareable> config);
+  void configureAnimationBatch(
+      std::vector<LayoutAnimationConfig> &layoutAnimationsBatch);
   void setShouldAnimateExiting(int tag, bool value);
   bool shouldAnimateExiting(int tag, bool shouldAnimate);
   bool hasLayoutAnimation(int tag, LayoutAnimationType type);

Common/cpp/NativeModules/NativeReanimatedModule.cpp

@@ -49,7 +49,8 @@ NativeReanimatedModule::NativeReanimatedModule(
     const std::shared_ptr<CallInvoker> &jsInvoker,
     const std::shared_ptr<MessageQueueThread> &jsQueue,
     const std::shared_ptr<UIScheduler> &uiScheduler,
-    const PlatformDepMethodsHolder &platformDepMethodsHolder)
+    const PlatformDepMethodsHolder &platformDepMethodsHolder,
+    const std::string &valueUnpackerCode)
     : NativeReanimatedModuleSpec(jsInvoker),
       jsQueue_(jsQueue),
       jsScheduler_(std::make_shared<JSScheduler>(rnRuntime, jsInvoker)),
@@ -58,7 +59,9 @@ NativeReanimatedModule::NativeReanimatedModule(
           rnRuntime,
           jsQueue,
           jsScheduler_,
-          "Reanimated UI runtime")),
+          "Reanimated UI runtime",
+          valueUnpackerCode)),
+      valueUnpackerCode_(valueUnpackerCode),
       eventHandlerRegistry_(std::make_unique<EventHandlerRegistry>()),
       requestRender_(platformDepMethodsHolder.requestRender),
       onRenderCallback_([this](const double timestampMs) {
@@ -132,13 +135,6 @@ NativeReanimatedModule::NativeReanimatedModule(
       platformDepMethodsHolder.maybeFlushUIUpdatesQueueFunction);
 }
 
-void NativeReanimatedModule::installValueUnpacker(
-    jsi::Runtime &rt,
-    const jsi::Value &valueUnpackerCode) {
-  valueUnpackerCode_ = valueUnpackerCode.asString(rt).utf8(rt);
-  uiWorkletRuntime_->installValueUnpacker(valueUnpackerCode_);
-}
-
 NativeReanimatedModule::~NativeReanimatedModule() {
   // event handler registry and frame callbacks store some JSI values from UI
   // runtime, so they have to go away before we tear down the runtime
@@ -170,8 +166,11 @@ jsi::Value NativeReanimatedModule::createWorkletRuntime(
     const jsi::Value &name,
     const jsi::Value &initializer) {
   auto workletRuntime = std::make_shared<WorkletRuntime>(
-      rt, jsQueue_, jsScheduler_, name.asString(rt).utf8(rt));
-  workletRuntime->installValueUnpacker(valueUnpackerCode_);
+      rt,
+      jsQueue_,
+      jsScheduler_,
+      name.asString(rt).utf8(rt),
+      valueUnpackerCode_);
   auto initializerShareable = extractShareableOrThrow<ShareableWorklet>(
       rt, initializer, "[Reanimated] Initializer must be a worklet.");
   workletRuntime->runGuarded(initializerShareable);
@@ -324,6 +323,32 @@ jsi::Value NativeReanimatedModule::configureLayoutAnimation(
   return jsi::Value::undefined();
 }
 
+jsi::Value NativeReanimatedModule::configureLayoutAnimationBatch(
+    jsi::Runtime &rt,
+    const jsi::Value &layoutAnimationsBatch) {
+  auto array = layoutAnimationsBatch.asObject(rt).asArray(rt);
+  size_t length = array.size(rt);
+  std::vector<LayoutAnimationConfig> batch(length);
+  for (int i = 0; i < length; i++) {
+    auto item = array.getValueAtIndex(rt, i).asObject(rt);
+    auto &batchItem = batch[i];
+    batchItem.tag = item.getProperty(rt, "viewTag").asNumber();
+    batchItem.type = static_cast<LayoutAnimationType>(
+        item.getProperty(rt, "type").asNumber());
+    auto config = item.getProperty(rt, "config");
+    if (config.isUndefined()) {
+      batchItem.config = nullptr;
+    } else {
+      batchItem.config = extractShareableOrThrow<ShareableObject>(
+          rt,
+          config,
+          "[Reanimated] Layout animation config must be an object.");
+    }
+  }
+  layoutAnimationsManager_.configureAnimationBatch(batch);
+  return jsi::Value::undefined();
+}
+
 void NativeReanimatedModule::setShouldAnimateExiting(
     jsi::Runtime &rt,
     const jsi::Value &viewTag,

Common/cpp/NativeModules/NativeReanimatedModule.h

@@ -36,14 +36,11 @@ class NativeReanimatedModule : public NativeReanimatedModuleSpec {
       const std::shared_ptr<CallInvoker> &jsInvoker,
       const std::shared_ptr<MessageQueueThread> &jsQueue,
       const std::shared_ptr<UIScheduler> &uiScheduler,
-      const PlatformDepMethodsHolder &platformDepMethodsHolder);
+      const PlatformDepMethodsHolder &platformDepMethodsHolder,
+      const std::string &valueUnpackerCode);
 
   ~NativeReanimatedModule();
 
-  void installValueUnpacker(
-      jsi::Runtime &rt,
-      const jsi::Value &valueUnpackerCode) override;
-
   jsi::Value makeShareableClone(
       jsi::Runtime &rt,
       const jsi::Value &value,
@@ -98,6 +95,9 @@ class NativeReanimatedModule : public NativeReanimatedModuleSpec {
       const jsi::Value &type,
       const jsi::Value &sharedTransitionTag,
       const jsi::Value &config) override;
+  jsi::Value configureLayoutAnimationBatch(
+      jsi::Runtime &rt,
+      const jsi::Value &layoutAnimationsBatch) override;
   void setShouldAnimateExiting(
       jsi::Runtime &rt,
       const jsi::Value &viewTag,

Common/cpp/NativeModules/NativeReanimatedModuleSpec.cpp

@@ -6,16 +6,6 @@
 
 namespace reanimated {
 
-static jsi::Value SPEC_PREFIX(installValueUnpacker)(
-    jsi::Runtime &rt,
-    TurboModule &turboModule,
-    const jsi::Value *args,
-    size_t) {
-  static_cast<NativeReanimatedModuleSpec *>(&turboModule)
-      ->installValueUnpacker(rt, std::move(args[0]));
-  return jsi::Value::undefined();
-}
-
 // SharedValue
 
 static jsi::Value SPEC_PREFIX(makeShareableClone)(
@@ -185,6 +175,15 @@ static jsi::Value SPEC_PREFIX(configureLayoutAnimation)(
           std::move(args[3]));
 }
 
+static jsi::Value SPEC_PREFIX(configureLayoutAnimationBatch)(
+    jsi::Runtime &rt,
+    TurboModule &turboModule,
+    const jsi::Value *args,
+    size_t) {
+  return static_cast<NativeReanimatedModuleSpec *>(&turboModule)
+      ->configureLayoutAnimationBatch(rt, std::move(args[0]));
+}
+
 static jsi::Value SPEC_PREFIX(setShouldAnimateExiting)(
     jsi::Runtime &rt,
     TurboModule &turboModule,
@@ -198,9 +197,6 @@ static jsi::Value SPEC_PREFIX(setShouldAnimateExiting)(
 NativeReanimatedModuleSpec::NativeReanimatedModuleSpec(
     std::shared_ptr<CallInvoker> jsInvoker)
     : TurboModule("NativeReanimated", jsInvoker) {
-  methodMap_["installValueUnpacker"] =
-      MethodMetadata{1, SPEC_PREFIX(installValueUnpacker)};
-
   methodMap_["makeShareableClone"] =
       MethodMetadata{2, SPEC_PREFIX(makeShareableClone)};
 
@@ -234,6 +230,8 @@ NativeReanimatedModuleSpec::NativeReanimatedModuleSpec(
 
   methodMap_["configureLayoutAnimation"] =
       MethodMetadata{4, SPEC_PREFIX(configureLayoutAnimation)};
+  methodMap_["configureLayoutAnimationBatch"] =
+      MethodMetadata{1, SPEC_PREFIX(configureLayoutAnimationBatch)};
   methodMap_["setShouldAnimateExitingForTag"] =
       MethodMetadata{2, SPEC_PREFIX(setShouldAnimateExiting)};
 }

Common/cpp/NativeModules/NativeReanimatedModuleSpec.h

@@ -22,10 +22,6 @@ class JSI_EXPORT NativeReanimatedModuleSpec : public TurboModule {
   explicit NativeReanimatedModuleSpec(std::shared_ptr<CallInvoker> jsInvoker);
 
  public:
-  virtual void installValueUnpacker(
-      jsi::Runtime &rt,
-      const jsi::Value &valueUnpackerCode) = 0;
-
   // SharedValue
   virtual jsi::Value makeShareableClone(
       jsi::Runtime &rt,
@@ -107,6 +103,10 @@ class JSI_EXPORT NativeReanimatedModuleSpec : public TurboModule {
       const jsi::Value &sharedTransitionTag,
       const jsi::Value &config) = 0;
 
+  virtual jsi::Value configureLayoutAnimationBatch(
+      jsi::Runtime &rt,
+      const jsi::Value &layoutAnimationsBatch) = 0;
+
   virtual void setShouldAnimateExiting(
       jsi::Runtime &rt,
       const jsi::Value &viewTag,

Common/cpp/ReanimatedRuntime/RNRuntimeDecorator.cpp

@@ -32,6 +32,7 @@ void RNRuntimeDecorator::decorate(
 #ifndef NDEBUG
   checkJSVersion(rnRuntime, nativeReanimatedModule->getJSLogger());
 #endif // NDEBUG
+  injectReanimatedCppVersion(rnRuntime);
 
   rnRuntime.global().setProperty(
       rnRuntime, "_REANIMATED_IS_REDUCED_MOTION", isReducedMotion);

Common/cpp/ReanimatedRuntime/WorkletRuntime.cpp

@@ -10,21 +10,19 @@ WorkletRuntime::WorkletRuntime(
     jsi::Runtime &rnRuntime,
     const std::shared_ptr<MessageQueueThread> &jsQueue,
     const std::shared_ptr<JSScheduler> &jsScheduler,
-    const std::string &name)
+    const std::string &name,
+    const std::string &valueUnpackerCode)
     : runtime_(ReanimatedRuntime::make(rnRuntime, jsQueue, name)), name_(name) {
   jsi::Runtime &rt = *runtime_;
   WorkletRuntimeCollector::install(rt);
   WorkletRuntimeDecorator::decorate(rt, name, jsScheduler);
-}
 
-void WorkletRuntime::installValueUnpacker(
-    const std::string &valueUnpackerCode) {
-  jsi::Runtime &rt = *runtime_;
   auto codeBuffer = std::make_shared<const jsi::StringBuffer>(
       "(" + valueUnpackerCode + "\n)");
-  auto valueUnpacker = rt.evaluateJavaScript(codeBuffer, "installValueUnpacker")
-                           .asObject(rt)
-                           .asFunction(rt);
+  auto valueUnpacker =
+      rt.evaluateJavaScript(codeBuffer, "WorkletRuntime::WorkletRuntime")
+          .asObject(rt)
+          .asFunction(rt);
   rt.global().setProperty(rt, "__valueUnpacker", valueUnpacker);
 }
 

Common/cpp/ReanimatedRuntime/WorkletRuntime.h

@@ -25,9 +25,8 @@ class WorkletRuntime : public jsi::HostObject,
       jsi::Runtime &rnRuntime,
       const std::shared_ptr<MessageQueueThread> &jsQueue,
       const std::shared_ptr<JSScheduler> &jsScheduler,
-      const std::string &name);
-
-  void installValueUnpacker(const std::string &valueUnpackerCode);
+      const std::string &name,
+      const std::string &valueUnpackerCode);
 
   jsi::Runtime &getJSIRuntime() const {
     return *runtime_;