react-native-reanimated 2.3.0-beta.3 → 2.3.2

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;
@@ -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/Tools/FeaturesConfig.cpp

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

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));
@@ -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/headers/NativeModules/NativeReanimatedModule.h

@@ -68,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

@@ -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/Tools/FeaturesConfig.h

@@ -0,0 +1,19 @@
+#pragma once
+#include <string>
+
+namespace reanimated {
+
+class FeaturesConfig {
+ public:
+  static inline bool isLayoutAnimationEnabled() {
+    return _isLayoutAnimationEnabled;
+  }
+  static inline void setLayoutAnimationEnabled(bool isLayoutAnimationEnabled) {
+    _isLayoutAnimationEnabled = isLayoutAnimationEnabled;
+  }
+
+ private:
+  static bool _isLayoutAnimationEnabled;
+};
+
+} // namespace reanimated

package/Common/cpp/headers/Tools/PlatformDepMethodsHolder.h

@@ -21,6 +21,7 @@ using ScrollToFunction = std::function<void(int, double, double, bool)>;
 using MeasuringFunction =
     std::function<std::vector<std::pair<std::string, double>>(int)>;
 using TimeProviderFunction = std::function<double(void)>;
+using SetGestureStateFunction = std::function<void(int, int)>;
 
 struct PlatformDepMethodsHolder {
   RequestRender requestRender;
@@ -28,6 +29,7 @@ struct PlatformDepMethodsHolder {
   ScrollToFunction scrollToFunction;
   MeasuringFunction measuringFunction;
   TimeProviderFunction getCurrentTime;
+  SetGestureStateFunction setGestureStateFunction;
 };
 
 } // namespace reanimated

package/Common/cpp/headers/Tools/RuntimeDecorator.h

@@ -36,6 +36,7 @@ class RuntimeDecorator {
       const ScrollToFunction scrollTo,
       const MeasuringFunction measure,
       const TimeProviderFunction getCurrentTime,
+      const SetGestureStateFunction setGestureState,
       std::shared_ptr<LayoutAnimationsProxy> layoutAnimationsProxy);
 
   /**
@@ -58,27 +59,27 @@ class RuntimeDecorator {
   static void registerRuntime(jsi::Runtime *runtime, RuntimeType runtimeType);
 
  private:
-  static std::unordered_map<RuntimePointer, RuntimeType> runtimeRegistry;
+  static std::unordered_map<RuntimePointer, RuntimeType> &runtimeRegistry();
 };
 
 inline bool RuntimeDecorator::isUIRuntime(jsi::Runtime &rt) {
-  auto iterator = runtimeRegistry.find(&rt);
-  if (iterator == runtimeRegistry.end())
+  auto iterator = runtimeRegistry().find(&rt);
+  if (iterator == runtimeRegistry().end())
     return false;
   return iterator->second == RuntimeType::UI;
 }
 
 inline bool RuntimeDecorator::isWorkletRuntime(jsi::Runtime &rt) {
-  auto iterator = runtimeRegistry.find(&rt);
-  if (iterator == runtimeRegistry.end())
+  auto iterator = runtimeRegistry().find(&rt);
+  if (iterator == runtimeRegistry().end())
     return false;
   auto type = iterator->second;
   return type == RuntimeType::UI || type == RuntimeType::Worklet;
 }
 
 inline bool RuntimeDecorator::isReactRuntime(jsi::Runtime &rt) {
-  auto iterator = runtimeRegistry.find(&rt);
-  if (iterator == runtimeRegistry.end())
+  auto iterator = runtimeRegistry().find(&rt);
+  if (iterator == runtimeRegistry().end())
     return true;
   return false;
 }

package/README.md

@@ -19,7 +19,7 @@ Check out our dedicated documentation page for info about this library, API refe
 
 ## Examples
 
-The source code for the example (showcase) app is under the [`Example/`](https://github.com/software-mansion/react-native-reanimated/blob/master/Example/) directory.
+The source code for the example (showcase) app is under the [`Example/`](https://github.com/software-mansion/react-native-reanimated/blob/main/Example/) directory.
 If you want to play with the API but don't feel like trying it on a real app, you can run the example project. Check Example/ directory README for installation instructions.
 
 ## License

package/RNReanimated.podspec

@@ -5,10 +5,28 @@ package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 reactVersion = '0.0.0'
 
 begin
+  # standard app
+  # /appName/node_modules/react-native-reanimated/RNReanimated.podspec
+  # /appName/node_modules/react-native/package.json
   reactVersion = JSON.parse(File.read(File.join(__dir__, "..", "..", "node_modules", "react-native", "package.json")))["version"]
 rescue
-  # Example app
-  reactVersion = JSON.parse(File.read(File.join(__dir__, "node_modules", "react-native", "package.json")))["version"]
+  begin
+    # monorepo
+    # /monorepo/packages/appName/node_modules/react-native-reanimated/RNReanimated.podspec
+    # /monorepo/node_modules/react-native/package.json
+    reactVersion = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "node_modules", "react-native", "package.json")))["version"]
+  rescue
+    begin
+      # Example app in reanimated repo
+      # /react-native-reanimated/RNReanimated.podspec
+      # /react-native-reanimated/node_modules/react-native/package.json
+      reactVersion = JSON.parse(File.read(File.join(__dir__, "node_modules", "react-native", "package.json")))["version"]
+    rescue
+      # should never happen
+      reactVersion = '0.66.0'
+      puts "[RNReanimated] Unable to recognized your `react-native` version! Default `react-native` version: " + reactVersion
+    end
+  end
 end
 
 rnVersion = reactVersion.split('.')[1]
@@ -75,7 +93,6 @@ Pod::Spec.new do |s|
   s.dependency 'React-RCTBlob'
   s.dependency 'React-RCTSettings'
   s.dependency 'React-RCTText'
-  s.dependency 'React-RCTVibration'
   s.dependency 'React-RCTImage'
   s.dependency 'React-Core/RCTWebSocket'
   s.dependency 'React-cxxreact'

package/android/build.gradle

@@ -31,14 +31,14 @@ abstract class replaceSoTask extends DefaultTask {
 def getCurrentFlavor() {
     Gradle gradle = getGradle()
     String taskRequestName = gradle.getStartParameter().getTaskRequests().toString()
-    Pattern pattern = Pattern.compile("(assemble|install|generate)(\\w+)(Release|Debug)")
+    Pattern pattern = Pattern.compile("(assemble|bundle|install|generate)(\\w*)(Release|Debug)")
     Matcher matcher = pattern.matcher(taskRequestName)
 
     if(matcher.find()) {
         return matcher.group(2)
     }
 
-    return ""
+    return "NOT-FOUND"
 }
 
 def replaceSoTaskDebug
@@ -58,8 +58,9 @@ rootProject.getSubprojects().forEach({project ->
 
         if(project.getProperties().get("android") && Integer.parseInt(minor) < 65) {
             def projectProperties = project.getProperties()
-            if(!projectProperties.get("reanimated")
-                    || (projectProperties.get("reanimated") && projectProperties.get("reanimated").get("enablePackagingOptions"))
+            final NOTFOUND = "NOT-FOUND"
+            if(!NOTFOUND.equals(getCurrentFlavor()) && (!projectProperties.get("reanimated")
+                    || (projectProperties.get("reanimated") && projectProperties.get("reanimated").get("enablePackagingOptions")))
             ) {
                 def flavorString = getCurrentFlavor()
                 replaceSoTask.appName = project.getProperties().path
@@ -82,4 +83,29 @@ rootProject.getSubprojects().forEach({project ->
     }
 })
 
-artifacts.add("default", file("react-native-reanimated-${minor}-${engine}.aar"))
+def minorCopy = Integer.parseInt(minor)
+def aar = file("react-native-reanimated-${minorCopy}-${engine}.aar")
+
+while (!aar.exists()) {
+    minorCopy -= 1
+    aar = file("react-native-reanimated-${minorCopy}-${engine}.aar")
+    if (minorCopy < 63) {
+      throw new GradleException('No aar for react-native-reanimated found.')
+    }
+    if (aar.exists()) {
+      println "\n\n\n"
+      println "****************************************************************************************"
+      println "\n\n\n"
+      println "WARNING reanimated - no version-specific reanimated AAR for react-native version " . minor . " found."
+      println "Falling back to AAR for react-native version " . minorCopy
+      println "The react-native JSI interface is not ABI-safe yet, this may result in crashes."
+      println "Please post a pull request to implement support for react-native version " . minor . " to the reanimated repo."
+      println "Thanks!"
+      println "\n\n\n"
+      println "****************************************************************************************"
+    }    
+}
+
+artifacts.add("default", aar)
+
+apply from: './expo/linking.gradle'

package/android/expo/linking.gradle

@@ -0,0 +1,46 @@
+def isExpoLinked = false
+rootProject.getSubprojects().forEach({ project ->
+    if (project.plugins.hasPlugin("com.android.application")) {
+        if (project.configurations.implementation.getDependencies().find { dep -> dep.name == "expo" }) {
+            isExpoLinked = true
+        }
+    }
+})
+
+def safeExtGet(prop, fallback) {
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
+
+if (isExpoLinked) {
+    apply plugin: 'com.android.library'
+
+    android {
+        // Disable aar bundling to fix the error when running `gradle assembleRelease` over `gradle :app:assembleRelease`
+        // which will throw `Direct local .aar file dependencies are not supported when building an AAR.`
+        tasks.whenTaskAdded { task ->
+            if (['bundleDebugAar', 'bundleReleaseAar'].contains(task.name)) {
+                task.enabled = false
+            }
+        }
+
+        compileSdkVersion safeExtGet('compileSdkVersion', 30)
+
+        sourceSets {
+            main.manifest.srcFile 'src/AndroidManifest.xml'
+            main.java.srcDirs = [ 'expo/src/main/java' ]
+        }
+
+        libraryVariants.all {
+            generateBuildConfigProvider?.get()?.enabled = false
+        }
+    }
+
+    dependencies {
+        implementation 'com.facebook.react:react-native:+'
+        implementation project(':expo-modules-core')
+
+        project.configurations.default.artifacts.each { artifact ->
+            api files(artifact.file)
+        }
+    }
+}

package/android/expo/src/main/java/com/swmansion/reanimated/EXReanimatedAdapter.java

@@ -0,0 +1,12 @@
+package com.swmansion.reanimated;
+
+import com.facebook.react.bridge.JavaScriptContextHolder;
+import com.facebook.react.bridge.ReactApplicationContext;
+
+public class EXReanimatedAdapter {
+  public static void registerJSIModules(ReactApplicationContext reactApplicationContext, JavaScriptContextHolder jsContext) {
+    NodesManager nodesManager =
+      reactApplicationContext.getNativeModule(ReanimatedModule.class).getNodesManager();
+    nodesManager.initWithContext(reactApplicationContext);
+  }
+}

package/android/expo/src/main/java/expo/modules/adapters/reanimated/EXReanimatedPackage.java

@@ -0,0 +1,26 @@
+package expo.modules.adapters.reanimated;
+
+import android.content.Context;
+
+import com.facebook.react.bridge.JavaScriptContextHolder;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.swmansion.reanimated.EXReanimatedAdapter;
+
+import java.util.Collections;
+import java.util.List;
+
+import expo.modules.core.interfaces.Package;
+import expo.modules.core.interfaces.ReactNativeHostHandler;
+
+public class EXReanimatedPackage implements Package {
+  @Override
+  public List<? extends ReactNativeHostHandler> createReactNativeHostHandlers(Context context) {
+    final ReactNativeHostHandler handler = new ReactNativeHostHandler() {
+      @Override
+      public void onRegisterJSIModules(ReactApplicationContext reactApplicationContext, JavaScriptContextHolder jsContext, boolean useDeveloperSupport) {
+        EXReanimatedAdapter.registerJSIModules(reactApplicationContext, jsContext);
+      }
+    };
+    return Collections.singletonList(handler);
+  }
+}

package/expo-module.config.json

@@ -0,0 +1,3 @@
+{
+  "platforms": ["android"]
+}

package/ios/LayoutReanimation/REAAnimationsManager.m

@@ -7,6 +7,8 @@
 
 @interface REAAnimationsManager ()
 
+typedef NS_ENUM(NSInteger, FrameConfigType) { EnteringFrame, ExitingFrame };
+
 @property (atomic, nullable) void (^startAnimationForTag)(NSNumber *, NSString *, NSDictionary *, NSNumber *);
 @property (atomic, nullable) void (^removeConfigForTag)(NSNumber *);
 
@@ -21,6 +23,8 @@
   NSMutableDictionary<NSNumber *, NSNumber *> *_states;
   NSMutableDictionary<NSNumber *, UIView *> *_viewForTag;
   NSMutableSet<NSNumber *> *_toRemove;
+  NSMutableArray<NSString *> *_targetKeys;
+  NSMutableArray<NSString *> *_currentKeys;
   BOOL _cleaningScheduled;
 }
 
@@ -43,6 +47,13 @@
     _viewForTag = [NSMutableDictionary new];
     _toRemove = [NSMutableSet new];
     _cleaningScheduled = false;
+
+    _targetKeys = [NSMutableArray new];
+    _currentKeys = [NSMutableArray new];
+    for (NSString *key in [[self class] layoutKeys]) {
+      [_targetKeys addObject:[NSString stringWithFormat:@"target%@", [key capitalizedString]]];
+      [_currentKeys addObject:[NSString stringWithFormat:@"current%@", [key capitalizedString]]];
+    }
   }
   return self;
 }
@@ -56,6 +67,8 @@
   _viewForTag = nil;
   _toRemove = nil;
   _cleaningScheduled = false;
+  _targetKeys = nil;
+  _currentKeys = nil;
 }
 
 - (void)setAnimationStartingBlock:
@@ -208,16 +221,53 @@
   [componentData setProps:newProps forView:view];
 }
 
-- (NSDictionary *)prepareDataForAnimatingWorklet:(NSMutableDictionary *)values
+- (NSDictionary *)prepareDataForAnimatingWorklet:(NSMutableDictionary *)values frameConfig:(FrameConfigType)frameConfig
+{
+  UIView *windowView = UIApplication.sharedApplication.keyWindow;
+  if (frameConfig == EnteringFrame) {
+    NSDictionary *preparedData = @{
+      @"targetWidth" : values[@"width"],
+      @"targetHeight" : values[@"height"],
+      @"targetOriginX" : values[@"originX"],
+      @"targetOriginY" : values[@"originY"],
+      @"targetGlobalOriginX" : values[@"globalOriginX"],
+      @"targetGlobalOriginY" : values[@"globalOriginY"],
+      @"windowWidth" : [NSNumber numberWithDouble:windowView.bounds.size.width],
+      @"windowHeight" : [NSNumber numberWithDouble:windowView.bounds.size.height]
+    };
+    return preparedData;
+  } else {
+    NSDictionary *preparedData = @{
+      @"currentWidth" : values[@"width"],
+      @"currentHeight" : values[@"height"],
+      @"currentOriginX" : values[@"originX"],
+      @"currentOriginY" : values[@"originY"],
+      @"currentGlobalOriginX" : values[@"globalOriginX"],
+      @"currentGlobalOriginY" : values[@"globalOriginY"],
+      @"windowWidth" : [NSNumber numberWithDouble:windowView.bounds.size.width],
+      @"windowHeight" : [NSNumber numberWithDouble:windowView.bounds.size.height]
+    };
+    return preparedData;
+  }
+}
+
+- (NSDictionary *)prepareDataForLayoutAnimatingWorklet:(NSMutableDictionary *)currentValues
+                                          targetValues:(NSMutableDictionary *)targetValues
 {
   UIView *windowView = UIApplication.sharedApplication.keyWindow;
   NSDictionary *preparedData = @{
-    @"width" : values[@"width"],
-    @"height" : values[@"height"],
-    @"originX" : values[@"originX"],
-    @"originY" : values[@"originY"],
-    @"globalOriginX" : values[@"globalOriginX"],
-    @"globalOriginY" : values[@"globalOriginY"],
+    @"currentWidth" : currentValues[@"width"],
+    @"currentHeight" : currentValues[@"height"],
+    @"currentOriginX" : currentValues[@"originX"],
+    @"currentOriginY" : currentValues[@"originY"],
+    @"currentGlobalOriginX" : currentValues[@"globalOriginX"],
+    @"currentGlobalOriginY" : currentValues[@"globalOriginY"],
+    @"targetWidth" : targetValues[@"width"],
+    @"targetHeight" : targetValues[@"height"],
+    @"targetOriginX" : targetValues[@"originX"],
+    @"targetOriginY" : targetValues[@"originY"],
+    @"targetGlobalOriginX" : targetValues[@"globalOriginX"],
+    @"targetGlobalOriginY" : targetValues[@"globalOriginY"],
     @"windowWidth" : [NSNumber numberWithDouble:windowView.bounds.size.width],
     @"windowHeight" : [NSNumber numberWithDouble:windowView.bounds.size.height]
   };
@@ -241,7 +291,7 @@
     return;
   }
   _states[tag] = [NSNumber numberWithInt:Disappearing];
-  NSDictionary *preparedValues = [self prepareDataForAnimatingWorklet:startValues];
+  NSDictionary *preparedValues = [self prepareDataForAnimatingWorklet:startValues frameConfig:ExitingFrame];
   _startAnimationForTag(tag, @"exiting", preparedValues, @(0));
 }
 
@@ -257,7 +307,7 @@
   ViewState state = [_states[tag] intValue];
   if (state == Inactive) {
     if (targetValues != nil) {
-      NSDictionary *preparedValues = [self prepareDataForAnimatingWorklet:targetValues];
+      NSDictionary *preparedValues = [self prepareDataForAnimatingWorklet:targetValues frameConfig:EnteringFrame];
       _startAnimationForTag(tag, @"entering", preparedValues, @(0));
     }
     return;
@@ -268,7 +318,7 @@
 {
   NSNumber *tag = view.reactTag;
   NSMutableDictionary *targetValues = after.values;
-  NSMutableDictionary *startValues = before.values;
+  NSMutableDictionary *currentValues = before.values;
   if (_states[tag] == nil) {
     return;
   }
@@ -278,8 +328,9 @@
   }
   if (state == Appearing) {
     BOOL doNotStartLayout = true;
-    for (NSString *key in [[self class] layoutKeys]) {
-      if ([((NSNumber *)startValues[key]) doubleValue] != [((NSNumber *)targetValues[key]) doubleValue]) {
+    for (int i = 0; i < [[self class] layoutKeys].count; ++i) {
+      if ([((NSNumber *)currentValues[_currentKeys[i]]) doubleValue] !=
+          [((NSNumber *)targetValues[_targetKeys[i]]) doubleValue]) {
         doNotStartLayout = false;
       }
     }
@@ -288,13 +339,7 @@
     }
   }
   _states[view.reactTag] = [NSNumber numberWithInt:Layout];
-  NSDictionary *preparedStartValues = [self prepareDataForAnimatingWorklet:startValues];
-  NSDictionary *preparedTargetValues = [self prepareDataForAnimatingWorklet:targetValues];
-  NSMutableDictionary *preparedValues = [NSMutableDictionary new];
-  [preparedValues addEntriesFromDictionary:preparedTargetValues];
-  for (NSString *key in preparedStartValues.allKeys) {
-    preparedValues[[NSString stringWithFormat:@"%@%@", @"b", key]] = preparedStartValues[key];
-  }
+  NSDictionary *preparedValues = [self prepareDataForLayoutAnimatingWorklet:currentValues targetValues:targetValues];
   _startAnimationForTag(view.reactTag, @"layout", preparedValues, @(0));
 }