react-native-reanimated 2.3.0-beta.2 → 2.3.1

package/Common/cpp/NativeModules/NativeReanimatedModule.cpp

@@ -3,6 +3,7 @@
 #include <memory>
 #include <thread>
 #include "EventHandlerRegistry.h"
+#include "FeaturesConfig.h"
 #include "FrozenObject.h"
 #include "JSIStoreValueUser.h"
 #include "Mapper.h"
@@ -84,6 +85,7 @@ NativeReanimatedModule::NativeReanimatedModule(
       platformDepMethodsHolder.scrollToFunction,
       platformDepMethodsHolder.measuringFunction,
       platformDepMethodsHolder.getCurrentTime,
+      platformDepMethodsHolder.setGestureStateFunction,
       layoutAnimationsProxy);
   onRenderCallback = [this](double timestampMs) {
     this->renderRequested = false;
@@ -164,7 +166,7 @@ jsi::Value NativeReanimatedModule::startMapper(
     maybeRequestRender();
   });
 
-  return jsi::Value((double)newMapperId);
+  return jsi::Value(static_cast<double>(newMapperId));
 }
 
 void NativeReanimatedModule::stopMapper(
@@ -196,7 +198,7 @@ jsi::Value NativeReanimatedModule::registerEventHandler(
     eventHandlerRegistry->registerEventHandler(handler);
   });
 
-  return jsi::Value((double)newRegistrationId);
+  return jsi::Value(static_cast<double>(newRegistrationId));
 }
 
 void NativeReanimatedModule::unregisterEventHandler(
@@ -212,7 +214,7 @@ jsi::Value NativeReanimatedModule::getViewProp(
     const jsi::Value &viewTag,
     const jsi::Value &propName,
     const jsi::Value &callback) {
-  const int viewTagInt = (int)viewTag.asNumber();
+  const int viewTagInt = static_cast<int>(viewTag.asNumber());
   std::string propNameStr = propName.asString(rt).utf8(rt);
   jsi::Function fun = callback.getObject(rt).asFunction(rt);
   std::shared_ptr<jsi::Function> funPtr =
@@ -234,6 +236,13 @@ jsi::Value NativeReanimatedModule::getViewProp(
   return jsi::Value::undefined();
 }
 
+jsi::Value NativeReanimatedModule::enableLayoutAnimations(
+    jsi::Runtime &rt,
+    const jsi::Value &config) {
+  FeaturesConfig::setLayoutAnimationEnabled(config.getBool());
+  return jsi::Value::undefined();
+}
+
 void NativeReanimatedModule::onEvent(
     std::string eventName,
     std::string eventAsString) {

package/Common/cpp/NativeModules/NativeReanimatedModuleSpec.cpp

@@ -99,6 +99,17 @@ static jsi::Value __hostFunction_NativeReanimatedModuleSpec_getViewProp(
   return jsi::Value::undefined();
 }
 
+static jsi::Value
+__hostFunction_NativeReanimatedModuleSpec_enableLayoutAnimations(
+    jsi::Runtime &rt,
+    TurboModule &turboModule,
+    const jsi::Value *args,
+    size_t count) {
+  static_cast<NativeReanimatedModuleSpec *>(&turboModule)
+      ->enableLayoutAnimations(rt, std::move(args[0]));
+  return jsi::Value::undefined();
+}
+
 NativeReanimatedModuleSpec::NativeReanimatedModuleSpec(
     std::shared_ptr<CallInvoker> jsInvoker)
     : TurboModule("NativeReanimated", jsInvoker) {
@@ -124,6 +135,8 @@ NativeReanimatedModuleSpec::NativeReanimatedModuleSpec(
 
   methodMap_["getViewProp"] =
       MethodMetadata{3, __hostFunction_NativeReanimatedModuleSpec_getViewProp};
+  methodMap_["enableLayoutAnimations"] = MethodMetadata{
+      2, __hostFunction_NativeReanimatedModuleSpec_enableLayoutAnimations};
 }
 
 } // namespace reanimated

package/Common/cpp/Registries/EventHandlerRegistry.cpp

@@ -50,7 +50,7 @@ void EventHandlerRegistry::processEvent(
   }
 
   auto eventObject = jsi::Value::createFromJsonUtf8(
-      rt, (uint8_t *)(&eventJSON[0]), eventJSON.size());
+      rt, reinterpret_cast<uint8_t *>(&eventJSON[0]), eventJSON.size());
 
   eventObject.asObject(rt).setProperty(
       rt, "eventName", jsi::String::createFromUtf8(rt, eventName));
@@ -62,7 +62,7 @@ void EventHandlerRegistry::processEvent(
 bool EventHandlerRegistry::isAnyHandlerWaitingForEvent(std::string eventName) {
   const std::lock_guard<std::mutex> lock(instanceMutex);
   auto it = eventMappings.find(eventName);
-  return (it != eventMappings.end()) and (!(it->second).empty());
+  return (it != eventMappings.end()) && (!(it->second).empty());
 }
 
 } // namespace reanimated

package/Common/cpp/Registries/MapperRegistry.cpp

@@ -39,7 +39,7 @@ void MapperRegistry::updateOrder() { // Topological sorting
     std::shared_ptr<Mapper> mapper;
     std::shared_ptr<MutableValue> mutableValue;
 
-    NodeID(std::shared_ptr<Mapper> mapper) {
+    explicit NodeID(std::shared_ptr<Mapper> mapper) {
       if (mapper == nullptr) {
         throw std::runtime_error(
             "Graph couldn't be sorted (Mapper cannot be nullptr)");
@@ -47,7 +47,7 @@ void MapperRegistry::updateOrder() { // Topological sorting
       this->mapper = mapper;
     }
 
-    NodeID(std::shared_ptr<MutableValue> mutableValue) {
+    explicit NodeID(std::shared_ptr<MutableValue> mutableValue) {
       if (mutableValue == nullptr) {
         throw std::runtime_error(
             "Graph couldn't be sorted (Mutable cannot be nullptr)");
@@ -97,7 +97,7 @@ void MapperRegistry::updateOrder() { // Topological sorting
     for (auto sharedValue : mapper->inputs) {
       auto sharedValueID = NodeID(sharedValue);
       mappersThatUseSharedValue[sharedValue].push_back(mapper);
-      if (deg.count(sharedValue) == 0) {
+      if (deg.count(sharedValueID) == 0) {
         deg[sharedValueID] = 0;
       }
     }
@@ -114,7 +114,7 @@ void MapperRegistry::updateOrder() { // Topological sorting
     }
   }
 
-  while (nodes.size() > 0 and nodes.begin()->first == 0) {
+  while (nodes.size() > 0 && nodes.begin()->first == 0) {
     auto entry = *nodes.begin();
     nodes.erase(entry);
 
@@ -123,7 +123,7 @@ void MapperRegistry::updateOrder() { // Topological sorting
 
     if (id.isMutable()) {
       for (auto id : mappersThatUseSharedValue[id.mutableValue]) {
-        toUpdate.push_back(id);
+        toUpdate.push_back(NodeID(id));
       }
     } else {
       for (auto sharedValue : id.mapper->outputs) {

package/Common/cpp/SharedItems/FrozenObject.cpp

@@ -27,9 +27,7 @@ jsi::Object FrozenObject::shallowClone(jsi::Runtime &rt) {
   for (auto propName : namesOrder) {
     auto value = map[propName];
     object.setProperty(
-        rt,
-        jsi::String::createFromUtf8(rt, propName),
-        value->getValue(rt));
+        rt, jsi::String::createFromUtf8(rt, propName), value->getValue(rt));
   }
   return object;
 }

package/Common/cpp/SharedItems/ShareableValue.cpp

@@ -13,16 +13,15 @@ const char *HIDDEN_HOST_OBJECT_PROP = "__reanimatedHostObjectRef";
 const char *ALREADY_CONVERTED = "__alreadyConverted";
 const char *CALL_ASYNC = "__callAsync";
 const char *PRIMAL_FUNCTION = "__primalFunction";
-std::string CALLBACK_ERROR_SUFFIX = R"(
-
-Possible solutions are:
-a) If you want to synchronously execute this method, mark it as a Worklet
-b) If you want to execute this method on the JS thread, wrap it using runOnJS )";
+const char *CALLBACK_ERROR_SUFFIX =
+    "\n\nPossible solutions are:\n"
+    "a) If you want to synchronously execute this method, mark it as a Worklet\n"
+    "b) If you want to execute this method on the JS thread, wrap it using runOnJS";
 
 void addHiddenProperty(
     jsi::Runtime &rt,
     jsi::Value &&value,
-    jsi::Object &obj,
+    const jsi::Object &obj,
     const char *name) {
   jsi::Object globalObject = rt.global().getPropertyAsObject(rt, "Object");
   jsi::Function defineProperty =
@@ -34,7 +33,7 @@ void addHiddenProperty(
   defineProperty.call(rt, obj, internalPropName, paramForDefineProperty);
 }
 
-void freeze(jsi::Runtime &rt, jsi::Object &obj) {
+void freeze(jsi::Runtime &rt, const jsi::Object &obj) {
   jsi::Object globalObject = rt.global().getPropertyAsObject(rt, "Object");
   jsi::Function freeze = globalObject.getPropertyAsFunction(rt, "freeze");
   freeze.call(rt, obj);
@@ -344,7 +343,7 @@ jsi::Value ShareableValue::toJSValue(jsi::Runtime &rt) {
                 hostFunction->getPureFunction().get()->call(
                     *hostRuntime,
                     static_cast<const jsi::Value *>(args),
-                    (size_t)params.size());
+                    static_cast<size_t>(params.size()));
 
             delete[] args;
             // ToDo use returned value to return promise
@@ -455,8 +454,7 @@ jsi::Value ShareableValue::toJSValue(jsi::Runtime &rt) {
               returnedValue = funPtr->call(
                   rt,
                   static_cast<const jsi::Value *>(args),
-                  (size_t)params.size());
-
+                  static_cast<size_t>(params.size()));
             } catch (std::exception &e) {
               std::string str = e.what();
               runtimeManager->errorHandler->setError(str);

package/Common/cpp/Tools/FeaturesConfig.cpp

@@ -0,0 +1,5 @@
+#include "FeaturesConfig.h"
+
+namespace reanimated {
+bool FeaturesConfig::_isLayoutAnimationEnabled = false;
+}

package/Common/cpp/Tools/JSIStoreValueUser.cpp

@@ -21,7 +21,7 @@ std::weak_ptr<jsi::Value> StoreUser::getWeakRef(jsi::Runtime &rt) {
 
 StoreUser::StoreUser(
     std::shared_ptr<Scheduler> s,
-    RuntimeManager &runtimeManager)
+    const RuntimeManager &runtimeManager)
     : scheduler(s) {
   storeUserData = runtimeManager.storeUserData;
   identifier = storeUserData->ctr++;
@@ -32,7 +32,7 @@ StoreUser::~StoreUser() {
   std::shared_ptr<Scheduler> strongScheduler = scheduler.lock();
   if (strongScheduler != nullptr) {
     std::shared_ptr<StaticStoreUser> sud = storeUserData;
-    #ifdef ONANDROID
+#ifdef ONANDROID
     jni::ThreadScope::WithClassLoader([&] {
       strongScheduler->scheduleOnUI([id, sud]() {
         const std::lock_guard<std::recursive_mutex> lock(sud->storeMutex);
@@ -41,14 +41,14 @@ StoreUser::~StoreUser() {
         }
       });
     });
-    #else 
+#else
     strongScheduler->scheduleOnUI([id, sud]() {
-        const std::lock_guard<std::recursive_mutex> lock(sud->storeMutex);
-        if (sud->store.count(id) > 0) {
-          sud->store.erase(id);
-        }
+      const std::lock_guard<std::recursive_mutex> lock(sud->storeMutex);
+      if (sud->store.count(id) > 0) {
+        sud->store.erase(id);
+      }
     });
-    #endif
+#endif
   }
 }
 

package/Common/cpp/Tools/Mapper.cpp

@@ -36,7 +36,7 @@ void Mapper::execute(jsi::Runtime &rt) {
           jsViewDescriptorArray.getValueAtIndex(rt, i).getObject(rt);
       (*updateProps)(
           rt,
-          (int)jsViewDescriptor.getProperty(rt, "tag").asNumber(),
+          static_cast<int>(jsViewDescriptor.getProperty(rt, "tag").asNumber()),
           jsViewDescriptor.getProperty(rt, "name"),
           newStyle);
     }

package/Common/cpp/Tools/RuntimeDecorator.cpp

@@ -1,4 +1,5 @@
 #include "RuntimeDecorator.h"
+#include <chrono>
 #include <memory>
 #include <unordered_map>
 #include "LayoutAnimationsProxy.h"
@@ -8,11 +9,15 @@
 namespace reanimated {
 
 std::unordered_map<RuntimePointer, RuntimeType>
-    RuntimeDecorator::runtimeRegistry;
+    &RuntimeDecorator::runtimeRegistry() {
+  static std::unordered_map<RuntimePointer, RuntimeType> runtimeRegistry;
+  return runtimeRegistry;
+}
+
 void RuntimeDecorator::registerRuntime(
     jsi::Runtime *runtime,
     RuntimeType runtimeType) {
-  runtimeRegistry.insert({runtime, runtimeType});
+  runtimeRegistry().insert({runtime, runtimeType});
 }
 
 void RuntimeDecorator::decorateRuntime(
@@ -79,6 +84,22 @@ void RuntimeDecorator::decorateRuntime(
           jsi::PropNameID::forAscii(rt, "_setGlobalConsole"),
           1,
           setGlobalConsole));
+
+  rt.global().setProperty(
+      rt,
+      "_chronoNow",
+      jsi::Function::createFromHostFunction(
+          rt,
+          jsi::PropNameID::forAscii(rt, "_chronoNow"),
+          0,
+          [](jsi::Runtime &rt,
+             const jsi::Value &thisValue,
+             const jsi::Value *args,
+             size_t count) -> jsi::Value {
+            double now = std::chrono::system_clock::now().time_since_epoch() /
+                std::chrono::milliseconds(1);
+            return jsi::Value(now);
+          }));
 }
 
 void RuntimeDecorator::decorateUIRuntime(
@@ -88,6 +109,7 @@ void RuntimeDecorator::decorateUIRuntime(
     const ScrollToFunction scrollTo,
     const MeasuringFunction measure,
     const TimeProviderFunction getCurrentTime,
+    const SetGestureStateFunction setGestureState,
     std::shared_ptr<LayoutAnimationsProxy> layoutAnimationsProxy) {
   RuntimeDecorator::decorateRuntime(rt, "UI");
   rt.global().setProperty(rt, "_UI", jsi::Value(true));
@@ -128,7 +150,7 @@ void RuntimeDecorator::decorateUIRuntime(
                   const jsi::Value &thisValue,
                   const jsi::Value *args,
                   const size_t count) -> jsi::Value {
-    int viewTag = (int)args[0].asNumber();
+    int viewTag = static_cast<int>(args[0].asNumber());
     double x = args[1].asNumber();
     double y = args[2].asNumber();
     bool animated = args[3].getBool();
@@ -144,7 +166,7 @@ void RuntimeDecorator::decorateUIRuntime(
                   const jsi::Value &thisValue,
                   const jsi::Value *args,
                   const size_t count) -> jsi::Value {
-    int viewTag = (int)args[0].asNumber();
+    int viewTag = static_cast<int>(args[0].asNumber());
     auto result = measure(viewTag);
     jsi::Object resultObject(rt);
     for (auto &i : result) {
@@ -207,6 +229,20 @@ void RuntimeDecorator::decorateUIRuntime(
   jsi::Value _stopObservingProgress = jsi::Function::createFromHostFunction(
       rt, jsi::PropNameID::forAscii(rt, "_stopObservingProgress"), 0, clb8);
   rt.global().setProperty(rt, "_stopObservingProgress", _stopObservingProgress);
+
+  auto clb9 = [setGestureState](
+                  jsi::Runtime &rt,
+                  const jsi::Value &thisValue,
+                  const jsi::Value *args,
+                  size_t count) -> jsi::Value {
+    int handlerTag = static_cast<int>(args[0].asNumber());
+    int newState = static_cast<int>(args[1].asNumber());
+    setGestureState(handlerTag, newState);
+    return jsi::Value::undefined();
+  };
+  jsi::Value setGestureStateFunction = jsi::Function::createFromHostFunction(
+      rt, jsi::PropNameID::forAscii(rt, "_setGestureState"), 2, clb9);
+  rt.global().setProperty(rt, "_setGestureState", setGestureStateFunction);
 }
 
 } // namespace reanimated

package/Common/cpp/Tools/WorkletEventHandler.cpp

@@ -2,7 +2,9 @@
 
 namespace reanimated {
 
-void WorkletEventHandler::process(jsi::Runtime &rt, jsi::Value &eventValue) {
+void WorkletEventHandler::process(
+    jsi::Runtime &rt,
+    const jsi::Value &eventValue) {
   handler.callWithThis(rt, handler, eventValue);
 }
 

package/Common/cpp/headers/NativeModules/NativeReanimatedModule.h

@@ -2,7 +2,9 @@
 
 #include <unistd.h>
 #include <memory>
+#include <string>
 #include <vector>
+
 #include "ErrorHandler.h"
 #include "LayoutAnimationsProxy.h"
 #include "NativeReanimatedModuleSpec.h"
@@ -66,6 +68,9 @@ class NativeReanimatedModule : public NativeReanimatedModuleSpec,
       const jsi::Value &propName,
       const jsi::Value &callback) override;
 
+  jsi::Value enableLayoutAnimations(jsi::Runtime &rt, const jsi::Value &config)
+      override;
+
   void onRender(double timestampMs);
   void onEvent(std::string eventName, std::string eventAsString);
   bool isAnyHandlerWaitingForEvent(std::string eventName);

package/Common/cpp/headers/NativeModules/NativeReanimatedModuleSpec.h

@@ -19,7 +19,7 @@ namespace reanimated {
 
 class JSI_EXPORT NativeReanimatedModuleSpec : public TurboModule {
  protected:
-  NativeReanimatedModuleSpec(std::shared_ptr<CallInvoker> jsInvoker);
+  explicit NativeReanimatedModuleSpec(std::shared_ptr<CallInvoker> jsInvoker);
 
  public:
   virtual void installCoreFunctions(
@@ -58,6 +58,11 @@ class JSI_EXPORT NativeReanimatedModuleSpec : public TurboModule {
       const jsi::Value &viewTag,
       const jsi::Value &propName,
       const jsi::Value &callback) = 0;
+
+  // other
+  virtual jsi::Value enableLayoutAnimations(
+      jsi::Runtime &rt,
+      const jsi::Value &config) = 0;
 };
 
 } // namespace reanimated

package/Common/cpp/headers/Registries/EventHandlerRegistry.h

@@ -2,6 +2,7 @@
 
 #include <jsi/jsi.h>
 #include <map>
+#include <memory>
 #include <mutex>
 #include <set>
 #include <string>

package/Common/cpp/headers/Registries/MapperRegistry.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <jsi/jsi.h>
+#include <memory>
 #include <unordered_map>
 #include <vector>
 

package/Common/cpp/headers/SharedItems/FrozenObject.h

@@ -1,6 +1,10 @@
 #pragma once
 
 #include <jsi/jsi.h>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
 #include "RuntimeManager.h"
 #include "SharedParent.h"
 #include "WorkletsCache.h"

package/Common/cpp/headers/SharedItems/HostFunctionHandler.h

@@ -1,6 +1,8 @@
 #pragma once
 
 #include <jsi/jsi.h>
+#include <memory>
+#include <string>
 
 using namespace facebook;
 

package/Common/cpp/headers/SharedItems/MutableValue.h

@@ -2,7 +2,9 @@
 
 #include <jsi/jsi.h>
 #include <map>
+#include <memory>
 #include <mutex>
+#include <vector>
 #include "JSIStoreValueUser.h"
 #include "LayoutAnimationsProxy.h"
 #include "MutableValueSetterProxy.h"

package/Common/cpp/headers/SharedItems/MutableValueSetterProxy.h

@@ -1,6 +1,8 @@
 #pragma once
 
 #include <jsi/jsi.h>
+#include <memory>
+#include <utility>
 #include "SharedParent.h"
 
 using namespace facebook;
@@ -13,7 +15,7 @@ class MutableValueSetterProxy : public jsi::HostObject {
   std::shared_ptr<MutableValue> mutableValue;
 
  public:
-  MutableValueSetterProxy(std::shared_ptr<MutableValue> mutableValue)
+  explicit MutableValueSetterProxy(std::shared_ptr<MutableValue> mutableValue)
       : mutableValue(std::move(mutableValue)) {}
   void
   set(jsi::Runtime &rt, const jsi::PropNameID &name, const jsi::Value &value);

package/Common/cpp/headers/SharedItems/RemoteObject.h

@@ -1,5 +1,8 @@
 #pragma once
 
+#include <memory>
+#include <vector>
+
 #include "FrozenObject.h"
 #include "JSIStoreValueUser.h"
 #include "SharedParent.h"
@@ -17,7 +20,7 @@ class RemoteObject : public jsi::HostObject, public StoreUser {
   void maybeInitializeOnWorkletRuntime(jsi::Runtime &rt);
   RemoteObject(
       jsi::Runtime &rt,
-      jsi::Object &object,
+      const jsi::Object &object,
       RuntimeManager *runtimeManager,
       std::shared_ptr<Scheduler> s)
       : StoreUser(s, *runtimeManager),

package/Common/cpp/headers/SharedItems/ShareableValue.h

@@ -1,9 +1,11 @@
 #pragma once
 
 #include <jsi/jsi.h>
+#include <memory>
 #include <mutex>
 #include <string>
 #include <unordered_map>
+#include <vector>
 #include "HostFunctionHandler.h"
 #include "JSIStoreValueUser.h"
 #include "LayoutAnimationsProxy.h"

package/Common/cpp/headers/SharedItems/SharedParent.h

@@ -8,15 +8,15 @@ enum class ValueType {
   BoolType,
   NumberType,
   StringType,
-  RemoteObjectType, /* object that can be instantiated on host side and modified
-                       on the remote (worklet) side */
-  MutableValueType, /* object with 'value' property that can be updated and read
-                       from any thread */
-  HostFunctionType, /* function that will be executed asynchronously on the host
-                       runtime */
-  WorkletFunctionType, /* function that gets run on the UI thread */
-  FrozenObjectType, /* frozen object, can only be set and never modified */
-  FrozenArrayType, /* frozen array, can only be set and never modified */
+  RemoteObjectType, // object that can be instantiated on host side and modified
+                    // on the remote (worklet) side
+  MutableValueType, // object with 'value' property that can be updated and read
+                    // from any thread
+  HostFunctionType, // function that will be executed asynchronously on the host
+                    // runtime
+  WorkletFunctionType, // function that gets run on the UI thread
+  FrozenObjectType, // frozen object, can only be set and never modified
+  FrozenArrayType, // frozen array, can only be set and never modified
 };
 
 class ShareableValue;