react-native-reanimated 3.0.2 → 3.2.0-nightly-20230516-474ca875c

package/Common/cpp/Fabric/FabricUtils.h

@@ -36,7 +36,7 @@ struct UIManagerPublic {
 struct BindingPublic : public jni::HybridClass<Binding>,
                        public SchedulerDelegate,
                        public LayoutAnimationStatusDelegate {
-  butter::shared_mutex installMutex_;
+  std::shared_mutex installMutex_;
   std::shared_ptr<FabricMountingManager> mountingManager_;
   std::shared_ptr<facebook::react::Scheduler> scheduler_;
 };

package/Common/cpp/NativeModules/NativeReanimatedModule.cpp

@@ -1,6 +1,7 @@
 #include "NativeReanimatedModule.h"
 
 #ifdef RCT_NEW_ARCH_ENABLED
+#include <react/renderer/core/TraitCast.h>
 #include <react/renderer/uimanager/UIManagerBinding.h>
 #include <react/renderer/uimanager/primitives.h>
 #endif
@@ -156,7 +157,8 @@ NativeReanimatedModule::NativeReanimatedModule(
       platformDepMethodsHolder.getCurrentTime,
       platformDepMethodsHolder.setGestureStateFunction,
       platformDepMethodsHolder.progressLayoutAnimation,
-      platformDepMethodsHolder.endLayoutAnimation);
+      platformDepMethodsHolder.endLayoutAnimation,
+      platformDepMethodsHolder.maybeFlushUIUpdatesQueueFunction);
   onRenderCallback = [this](double timestampMs) {
     this->renderRequested = false;
     this->onRender(timestampMs);
@@ -254,8 +256,14 @@ jsi::Value NativeReanimatedModule::makeShareableClone(
     } else if (!object.getProperty(rt, "__init").isUndefined()) {
       shareable = std::make_shared<ShareableHandle>(runtimeHelper, rt, object);
     } else if (object.isFunction(rt)) {
-      shareable = std::make_shared<ShareableRemoteFunction>(
-          runtimeHelper, rt, object.asFunction(rt));
+      auto function = object.asFunction(rt);
+      if (function.isHostFunction(rt)) {
+        shareable =
+            std::make_shared<ShareableHostFunction>(rt, std::move(function));
+      } else {
+        shareable = std::make_shared<ShareableRemoteFunction>(
+            runtimeHelper, rt, std::move(function));
+      }
     } else if (object.isArray(rt)) {
       if (shouldRetainRemote.isBool() && shouldRetainRemote.getBool()) {
         shareable = std::make_shared<RetainingShareable<ShareableArray>>(
@@ -547,37 +555,40 @@ void NativeReanimatedModule::performOperations() {
   shadowTreeRegistry.visit(surfaceId_, [&](ShadowTree const &shadowTree) {
     auto lock = newestShadowNodesRegistry_->createLock();
 
-    shadowTree.commit([&](RootShadowNode const &oldRootShadowNode) {
-      auto rootNode = oldRootShadowNode.ShadowNode::clone(ShadowNodeFragment{});
+    shadowTree.commit(
+        [&](RootShadowNode const &oldRootShadowNode) {
+          auto rootNode =
+              oldRootShadowNode.ShadowNode::clone(ShadowNodeFragment{});
 
-      ShadowTreeCloner shadowTreeCloner{
-          newestShadowNodesRegistry_, uiManager_, surfaceId_};
+          ShadowTreeCloner shadowTreeCloner{
+              newestShadowNodesRegistry_, uiManager_, surfaceId_};
 
-      for (const auto &pair : copiedOperationsQueue) {
-        const ShadowNodeFamily &family = pair.first->getFamily();
-        react_native_assert(family.getSurfaceId() == surfaceId_);
+          for (const auto &pair : copiedOperationsQueue) {
+            const ShadowNodeFamily &family = pair.first->getFamily();
+            react_native_assert(family.getSurfaceId() == surfaceId_);
 
-        auto newRootNode = shadowTreeCloner.cloneWithNewProps(
-            rootNode, family, RawProps(rt, *pair.second));
+            auto newRootNode = shadowTreeCloner.cloneWithNewProps(
+                rootNode, family, RawProps(rt, *pair.second));
 
-        if (newRootNode == nullptr) {
-          // this happens when React removed the component but Reanimated
-          // still tries to animate it, let's skip update for this specific
-          // component
-          continue;
-        }
-        rootNode = newRootNode;
-      }
+            if (newRootNode == nullptr) {
+              // this happens when React removed the component but Reanimated
+              // still tries to animate it, let's skip update for this specific
+              // component
+              continue;
+            }
+            rootNode = newRootNode;
+          }
 
-      // remove ShadowNodes and its ancestors from NewestShadowNodesRegistry
-      for (auto tag : copiedTagsToRemove) {
-        newestShadowNodesRegistry_->remove(tag);
-      }
+          // remove ShadowNodes and its ancestors from NewestShadowNodesRegistry
+          for (auto tag : copiedTagsToRemove) {
+            newestShadowNodesRegistry_->remove(tag);
+          }
 
-      shadowTreeCloner.updateYogaChildren();
+          shadowTreeCloner.updateYogaChildren();
 
-      return std::static_pointer_cast<RootShadowNode>(rootNode);
-    });
+          return std::static_pointer_cast<RootShadowNode>(rootNode);
+        },
+        {/* default commit options */});
   });
 }
 

package/Common/cpp/SharedItems/Shareables.h

@@ -116,6 +116,7 @@ class Shareable {
     HandleType,
     SynchronizedDataHolder,
     HostObjectType,
+    HostFunctionType,
   };
 
   explicit Shareable(ValueType valueType) : valueType_(valueType) {}
@@ -273,6 +274,27 @@ class ShareableHostObject : public Shareable {
   std::shared_ptr<jsi::HostObject> hostObject_;
 };
 
+class ShareableHostFunction : public Shareable {
+ public:
+  ShareableHostFunction(jsi::Runtime &rt, jsi::Function function)
+      : Shareable(HostFunctionType),
+        hostFunction_(
+            (assert(function.isHostFunction(rt)),
+             function.getHostFunction(rt))),
+        name_(function.getProperty(rt, "name").asString(rt).utf8(rt)),
+        paramCount_(function.getProperty(rt, "length").asNumber()) {}
+
+  jsi::Value toJSValue(jsi::Runtime &rt) override {
+    return jsi::Function::createFromHostFunction(
+        rt, jsi::PropNameID::forUtf8(rt, name_), paramCount_, hostFunction_);
+  }
+
+ protected:
+  jsi::HostFunctionType hostFunction_;
+  std::string name_;
+  unsigned int paramCount_;
+};
+
 class ShareableWorklet : public ShareableObject {
  private:
   std::shared_ptr<JSRuntimeHelper> runtimeHelper_;

package/Common/cpp/Tools/PlatformDepMethodsHolder.h

@@ -68,6 +68,7 @@ using ConfigurePropsFunction = std::function<void(
 using KeyboardEventSubscribeFunction =
     std::function<int(std::function<void(int, int)>, bool)>;
 using KeyboardEventUnsubscribeFunction = std::function<void(int)>;
+using MaybeFlushUIUpdatesQueueFunction = std::function<void()>;
 
 struct PlatformDepMethodsHolder {
   RequestRender requestRender;
@@ -87,6 +88,7 @@ struct PlatformDepMethodsHolder {
   SetGestureStateFunction setGestureStateFunction;
   KeyboardEventSubscribeFunction subscribeForKeyboardEvents;
   KeyboardEventUnsubscribeFunction unsubscribeFromKeyboardEvents;
+  MaybeFlushUIUpdatesQueueFunction maybeFlushUIUpdatesQueueFunction;
 };
 
 } // namespace reanimated

package/Common/cpp/Tools/RuntimeDecorator.cpp

@@ -91,7 +91,8 @@ void RuntimeDecorator::decorateUIRuntime(
     const TimeProviderFunction getCurrentTime,
     const SetGestureStateFunction setGestureState,
     const ProgressLayoutAnimationFunction progressLayoutAnimationFunction,
-    const EndLayoutAnimationFunction endLayoutAnimationFunction) {
+    const EndLayoutAnimationFunction endLayoutAnimationFunction,
+    const MaybeFlushUIUpdatesQueueFunction maybeFlushUIUpdatesQueueFunction) {
   RuntimeDecorator::decorateRuntime(rt, "UI");
   rt.global().setProperty(rt, "_UI", jsi::Value(true));
 
@@ -146,6 +147,8 @@ void RuntimeDecorator::decorateUIRuntime(
       rt, "_notifyAboutEnd", endLayoutAnimationFunction);
 
   jsi_utils::installJsiFunction(rt, "_setGestureState", setGestureState);
+  jsi_utils::installJsiFunction(
+      rt, "_maybeFlushUIUpdatesQueue", maybeFlushUIUpdatesQueueFunction);
 }
 
 } // namespace reanimated

package/Common/cpp/Tools/RuntimeDecorator.h

@@ -52,7 +52,8 @@ class RuntimeDecorator {
       const TimeProviderFunction getCurrentTime,
       const SetGestureStateFunction setGestureState,
       const ProgressLayoutAnimationFunction progressLayoutAnimationFunction,
-      const EndLayoutAnimationFunction endLayoutAnimationFunction);
+      const EndLayoutAnimationFunction endLayoutAnimationFunction,
+      const MaybeFlushUIUpdatesQueueFunction maybeFlushUIUpdatesQueueFunction);
 
   /**
    Returns true if the given Runtime is the Reanimated UI-Thread Runtime.

package/Common/cpp/Tools/SingleInstanceChecker.h

@@ -7,6 +7,10 @@
 #include <iostream>
 #include <string>
 
+#ifdef ANDROID
+#include <android/log.h>
+#endif
+
 namespace reanimated {
 
 // This is a class that counts how many instances of a different class there
@@ -22,8 +26,16 @@ class SingleInstanceChecker {
  private:
   void assertWithMessage(bool condition, std::string message) {
     if (!condition) {
-      std::cerr << message << std::endl;
-      assert(condition);
+#ifdef ANDROID
+      __android_log_print(
+          ANDROID_LOG_WARN, "Reanimated", "%s", message.c_str());
+#else
+      std::cerr << "[Reanimated] " << message << std::endl;
+#endif
+
+#ifdef IS_REANIMATED_EXAMPLE_APP
+      assert(false);
+#endif
     }
   }
 

package/RNReanimated.podspec

@@ -13,6 +13,7 @@ folly_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comm
 folly_compiler_flags = folly_flags + ' ' + '-Wno-comma -Wno-shorten-64-to-32'
 boost_compiler_flags = '-Wno-documentation'
 fabric_flags = fabric_enabled ? '-DRCT_NEW_ARCH_ENABLED' : ''
+example_flag = config[:is_reanimated_example_app] ? '-DIS_REANIMATED_EXAMPLE_APP' : ''
 version_flag = '-DREANIMATED_VERSION=' + reanimated_package_json["version"]
 
 Pod::Spec.new do |s|
@@ -48,7 +49,7 @@ Pod::Spec.new do |s|
   s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags + ' -DHERMES_ENABLE_DEBUGGER'
   s.xcconfig = {
     "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/#{folly_prefix}Folly\" \"$(PODS_ROOT)/Headers/Public/React-hermes\" \"$(PODS_ROOT)/Headers/Public/hermes-engine\" \"$(PODS_ROOT)/#{config[:react_native_common_dir]}\"",
-    "OTHER_CFLAGS" => "$(inherited)" + " " + folly_flags + " " + fabric_flags + " " + version_flag
+    "OTHER_CFLAGS" => "$(inherited)" + " " + folly_flags + " " + fabric_flags + " " + example_flag + " " + version_flag
   }
 
   s.requires_arc = true
@@ -65,7 +66,9 @@ Pod::Spec.new do |s|
   s.dependency "RCTTypeSafety"
   s.dependency "ReactCommon/turbomodule/core"
   s.dependency 'FBLazyVector'
-  s.dependency 'FBReactNativeSpec'
+  if config[:react_native_minor_version] <= 71
+    s.dependency 'FBReactNativeSpec'
+  end
   s.dependency 'React-Core'
   s.dependency 'React-CoreModules'
   s.dependency 'React-Core/DevSupport'

package/android/CMakeLists.txt

@@ -22,6 +22,10 @@ if(${IS_NEW_ARCHITECTURE_ENABLED})
     string(APPEND CMAKE_CXX_FLAGS " -DRCT_NEW_ARCH_ENABLED")
 endif()
 
+if(${IS_REANIMATED_EXAMPLE_APP})
+    string(APPEND CMAKE_CXX_FLAGS " -DIS_REANIMATED_EXAMPLE_APP")
+endif()
+
 if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
     string(APPEND CMAKE_CXX_FLAGS " -DDEBUG")
 endif()

package/android/build.gradle

@@ -2,6 +2,9 @@ import com.android.Version
 import org.apache.tools.ant.filters.ReplaceTokens
 import org.apache.tools.ant.taskdefs.condition.Os
 import groovy.json.JsonSlurper
+
+import javax.inject.Inject
+import java.nio.file.Files
 import java.nio.file.Paths
 
 /**
@@ -72,9 +75,12 @@ def resolveClientSideBuild() {
     return true
 }
 
+def isReanimatedExampleApp() {
+    return safeAppExtGet("isReanimatedExampleApp", false)
+}
+
 def isDeveloperMode() {
-    // developer mode, to run Example app
-    return safeAppExtGet("isReanimatedExampleApp", false) || System.getenv("REANIMATED_PACKAGE_BUILD") == "1"
+    return isReanimatedExampleApp() || System.getenv("REANIMATED_PACKAGE_BUILD") == "1"
 }
 
 def isNewArchitectureEnabled() {
@@ -138,41 +144,6 @@ def shouldAssertNoMultipleInstances() {
   }
 }
 
-def findReanimatedInstancesForPath(String path) {
-    return fileTree(path) {
-        include "**/react-native-reanimated/package.json"
-        exclude "**/.yarn/**"
-        exclude {{ file, attr -> attr.isSymbolicLink() }}
-    }.files
-}
-
-def checkNoMultipleInstances() {
-    // Assert there are no multiple installations of Reanimated
-    Set<File> files
-    if (projectDir.path.contains(rootDir.parent)) {
-        // standard app
-        files = findReanimatedInstancesForPath(rootDir.parent + "/node_modules")
-    } else {
-        // monorepo
-        files = findReanimatedInstancesForPath(rootDir.parent + "/node_modules")
-        files.addAll(
-            findReanimatedInstancesForPath(file(projectDir.parent).parent)
-        )
-    }
-    if (files.size() > 1) {
-        String parsedLocation = files.stream().map({
-            File file -> "- " + file.toString().replace("/package.json", "")
-        }).collect().join("\n")
-        String exceptionMessage = "\n[react-native-reanimated] Multiple versions of Reanimated " +
-            "were detected. Only one instance of react-native-reanimated can be installed in a " +
-            "project. You need to resolve the conflict manually. Check out the documentation: " +
-            "https://docs.swmansion.com/react-native-reanimated/docs/fundamentals/" +
-            "troubleshooting#multiple-versions-of-reanimated-were-detected \n\nConflict " +
-            "between: \n" + parsedLocation + "\n";
-        throw new GradleException(exceptionMessage)
-    }
-}
-
 def getReanimatedVersion() {
     def inputFile = file(projectDir.path + '/../package.json')
     def json = new JsonSlurper().parseText(inputFile.text)
@@ -431,6 +402,10 @@ apply plugin: "de.undercouch.download"
 
 android {
     compileSdkVersion safeExtGet("compileSdkVersion", 30)
+    def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
+    if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
+        namespace "com.swmansion.reanimated"
+    }
     if (REACT_NATIVE_MINOR_VERSION >= 71) {
         buildFeatures {
             prefab true
@@ -453,6 +428,7 @@ android {
                         "-DJS_RUNTIME_DIR=${jsRuntimeDir}",
                         "-DCLIENT_SIDE_BUILD=${CLIENT_SIDE_BUILD}",
                         "-DIS_NEW_ARCHITECTURE_ENABLED=${isNewArchitectureEnabled()}",
+                        "-DIS_REANIMATED_EXAMPLE_APP=${isReanimatedExampleApp()}",
                         "-DPLAYGROUND_APP_NAME=${getPlaygroundAppName()}",
                         "-DREANIMATED_PACKAGE_BUILD=${REANIMATED_PACKAGE_BUILD}",
                         "-DREANIMATED_VERSION=${REANIMATED_VERSION}"
@@ -576,15 +552,64 @@ android {
     }
 }
 
-def assertNoMultipleInstances = task assertNoMultipleInstancesTask {
-    onlyIf { shouldAssertNoMultipleInstances() && CLIENT_SIDE_BUILD }
-    doFirst {
-        checkNoMultipleInstances()
+abstract class NoMultipleInstancesAssertionTask extends DefaultTask {
+    @Inject abstract ObjectFactory getObjectFactory()
+
+    @Input abstract Property<File> getProjectDirFile()
+    @Input abstract Property<File> getRootDirFile()
+    @Input abstract Property<Boolean> getShouldCheck()
+
+    def findReanimatedInstancesForPath(String path) {
+        return objectFactory.fileTree().from(path)
+                .include("**/react-native-reanimated/package.json")
+                .exclude("**/.yarn/**")
+                .exclude({ Files.isSymbolicLink(it.getFile().toPath()) })
+                .findAll()
     }
+
+    @TaskAction
+    def check() {
+        if (shouldCheck.get()) {
+            // Assert there are no multiple installations of Reanimated
+            Set<File> files
+
+            if (projectDirFile.get().parent.contains(rootDirFile.get().parent)) {
+                // standard app
+                files = findReanimatedInstancesForPath(rootDirFile.get().parent + "/node_modules")
+            } else {
+                // monorepo
+                files = findReanimatedInstancesForPath(rootDirFile.get().parent + "/node_modules")
+                files.addAll(
+                    findReanimatedInstancesForPath(projectDirFile.get().parentFile.parent)
+                )
+            }
+
+            if (files.size() > 1) {
+                String parsedLocation = files.stream().map({
+                    File file -> "- " + file.toString().replace("/package.json", "")
+                }).collect().join("\n")
+                String exceptionMessage = "\n[react-native-reanimated] Multiple versions of Reanimated " +
+                        "were detected. Only one instance of react-native-reanimated can be installed in a " +
+                        "project. You need to resolve the conflict manually. Check out the documentation: " +
+                        "https://docs.swmansion.com/react-native-reanimated/docs/fundamentals/" +
+                        "troubleshooting#multiple-versions-of-reanimated-were-detected \n\nConflict " +
+                        "between: \n" + parsedLocation + "\n"
+                throw new GradleException(exceptionMessage)
+            }
+        }
+    }
+}
+
+tasks.register('assertNoMultipleInstances', NoMultipleInstancesAssertionTask) {
+    shouldCheck = shouldAssertNoMultipleInstances()
+    rootDirFile = rootDir
+    projectDirFile = projectDir
 }
 
+def NEW_ARCH_ENABLED = isNewArchitectureEnabled()
+
 def assertNoReanimated2WithNewArchitecture = task assertNoReanimated2WithNewArchitectureTask {
-    onlyIf { isNewArchitectureEnabled() && REANIMATED_MAJOR_VERSION == 2 }
+    onlyIf { NEW_ARCH_ENABLED && REANIMATED_MAJOR_VERSION == 2 }
     doFirst {
         throw new GradleException(
             "\n[react-native-reanimated] Reanimated 2.x does not support Fabric. " +
@@ -595,11 +620,11 @@ def assertNoReanimated2WithNewArchitecture = task assertNoReanimated2WithNewArch
 }
 
 def assertLatestReactNativeWithNewArchitecture = task assertLatestReactNativeWithNewArchitectureTask {
-    onlyIf { isNewArchitectureEnabled() && REANIMATED_MAJOR_VERSION == 3 && REACT_NATIVE_MINOR_VERSION < 71 }
+    onlyIf { NEW_ARCH_ENABLED && REANIMATED_MAJOR_VERSION == 3 && REACT_NATIVE_MINOR_VERSION < 72 }
     doFirst {
         throw new GradleException(
             "\n[react-native-reanimated] Reanimated " + REANIMATED_VERSION + " supports the New Architecture " +
-            "only on the latest minor release of React Native. Please upgrade to React Native 0.71.0+ " +
+            "only on the latest minor release of React Native. Please upgrade to React Native 0.72.0+ " +
             "or downgrade to an older version of Reanimated v3."
         )
     }
@@ -1066,14 +1091,14 @@ afterEvaluate {
         nativeBuildDependsOn(prepareThirdPartyNdkHeaders)
         nativeBuildDependsOn(extractAARHeaders)
         nativeBuildDependsOn(extractSOFiles)
-
-        tasks.forEach({ task ->
-            if (task.name.contains("JniLibFolders")) {
-                task.dependsOn(packageNdkLibs)
-            }
-        })
     }
 
+    tasks.forEach({ task ->
+        if (task.name.contains("JniLibFolders")) {
+            task.dependsOn(packageNdkLibs)
+        }
+    })
+
     if (JS_RUNTIME == "hermes") {
         if (REACT_NATIVE_MINOR_VERSION < 71) {
             extractAARHeaders.dependsOn(prepareHermes)