react-native-reanimated 2.2.0 → 2.2.4

package/Common/cpp/Tools/JSIStoreValueUser.cpp

@@ -1,43 +1,56 @@
+#ifdef ONANDROID
+#include <AndroidScheduler.h>
+#endif
 #include "JSIStoreValueUser.h"
 
 namespace reanimated {
 
-std::atomic<int> StoreUser::ctr;
-std::recursive_mutex StoreUser::storeMutex;
-std::unordered_map<int, std::vector<std::shared_ptr<jsi::Value>>> StoreUser::store;
+std::shared_ptr<StaticStoreUser> StoreUser::staticStoreUserData = std::make_shared<StaticStoreUser>();
 
 std::weak_ptr<jsi::Value> StoreUser::getWeakRef(jsi::Runtime &rt) {
-  const std::lock_guard<std::recursive_mutex> lock(storeMutex);
-  if (StoreUser::store.count(identifier) == 0) {
-    StoreUser::store[identifier] = std::vector<std::shared_ptr<jsi::Value>>();
+  const std::lock_guard<std::recursive_mutex> lock(storeUserData->storeMutex);
+  if (storeUserData->store.count(identifier) == 0) {
+    storeUserData->store[identifier] = std::vector<std::shared_ptr<jsi::Value>>();
   }
   std::shared_ptr<jsi::Value> sv = std::make_shared<jsi::Value>(rt, jsi::Value::undefined());
-  StoreUser::store[identifier].push_back(sv);
+  storeUserData->store[identifier].push_back(sv);
   
   return sv;
 }
 
 StoreUser::StoreUser(std::shared_ptr<Scheduler> s): scheduler(s) {
-  identifier = StoreUser::ctr++;
+  storeUserData = StoreUser::staticStoreUserData;
+  identifier = storeUserData->ctr++;
 }
 
 StoreUser::~StoreUser() {
   int id = identifier;
   std::shared_ptr<Scheduler> strongScheduler = scheduler.lock();
   if (strongScheduler != nullptr) {
-    strongScheduler->scheduleOnUI([id]() {
-      const std::lock_guard<std::recursive_mutex> lock(storeMutex);
-      if (StoreUser::store.count(id) > 0) {
-        StoreUser::store.erase(id);
+    std::shared_ptr<StaticStoreUser> sud = storeUserData;
+    #ifdef ONANDROID
+    jni::ThreadScope::WithClassLoader([&] {
+      strongScheduler->scheduleOnUI([id, sud]() {
+        const std::lock_guard<std::recursive_mutex> lock(sud->storeMutex);
+        if (sud->store.count(id) > 0) {
+          sud->store.erase(id);
+        }
+      });
+    });
+    #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);
       }
     });
+    #endif
   }
 }
 
-
 void StoreUser::clearStore() {
-  const std::lock_guard<std::recursive_mutex> lock(storeMutex);
-  StoreUser::store.clear();
+  const std::lock_guard<std::recursive_mutex> lock(StoreUser::staticStoreUserData->storeMutex);
+  StoreUser::staticStoreUserData->store.clear();
 }
 
 }

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

@@ -13,11 +13,16 @@ using namespace facebook;
 
 namespace reanimated {
 
+struct StaticStoreUser {
+    std::atomic<int> ctr;
+    std::unordered_map<int, std::vector<std::shared_ptr<jsi::Value>>> store;
+    std::recursive_mutex storeMutex;
+};
+
 class StoreUser {
   int identifier = 0;
-  static std::atomic<int> ctr;
-  static std::unordered_map<int, std::vector<std::shared_ptr<jsi::Value>>> store;
-  static std::recursive_mutex storeMutex;
+  static std::shared_ptr<StaticStoreUser> staticStoreUserData;
+  std::shared_ptr<StaticStoreUser> storeUserData;
   std::weak_ptr<Scheduler> scheduler;
   
 public:

package/RNReanimated.podspec

@@ -5,9 +5,10 @@ package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 reactVersion = '0.0.0'
 
 begin
-  reactVersion = JSON.parse(File.read(File.join(__dir__, "..", "react-native", "package.json")))["version"]
+  reactVersion = JSON.parse(File.read(File.join(__dir__, "..", "..", "node_modules", "react-native", "package.json")))["version"]
 rescue
-  reactVersion = '0.64.0'
+  # Example app
+  reactVersion = JSON.parse(File.read(File.join(__dir__, "node_modules", "react-native", "package.json")))["version"]
 end
 
 rnVersion = reactVersion.split('.')[1]
@@ -20,7 +21,7 @@ end
 
 folly_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DRNVERSION=' + rnVersion
 folly_compiler_flags = folly_flags + ' ' + '-Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.04.26.00'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|
@@ -49,12 +50,12 @@ Pod::Spec.new do |s|
 
   s.pod_target_xcconfig    = {
     "USE_HEADERMAP" => "YES",
-    "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/#{folly_prefix}Folly\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\" "
+    "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/#{folly_prefix}Folly\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\" "
   }
   s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags
   s.xcconfig               = {
     "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
-    "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/#{folly_prefix}Folly\"",
+    "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\"",
                                "OTHER_CFLAGS" => "$(inherited)" + " " + folly_flags  }
 
   s.requires_arc = true
@@ -95,4 +96,3 @@ Pod::Spec.new do |s|
   s.dependency "#{folly_prefix}Folly"
 
 end
-

package/android/build.gradle

@@ -1,4 +1,6 @@
-import groovy.json.JsonSlurper;
+import groovy.json.JsonSlurper
+import java.util.regex.Matcher
+import java.util.regex.Pattern
 configurations.maybeCreate("default")
 
 def inputFile = new File(projectDir, '../../react-native/package.json')
@@ -7,8 +9,89 @@ def reactNativeVersion = json.version as String
 def (major, minor, patch) = reactNativeVersion.tokenize('.')
 
 def engine = "jsc"
-if (project(':app').ext.react.enableHermes) {
-    engine = "hermes"
+
+abstract class replaceSoTask extends DefaultTask {
+    public static String appName = ":app"
+    public static String buildDir = "../../../android/app/build"
+
+    @TaskAction
+    def run() {
+        for(def abiVersion in ["x86", "x86_64", "armeabi-v7a", "arm64-v8a"]) {
+            ant.sequential {
+                copy(
+                        tofile: "${buildDir}/intermediates/merged_native_libs/debug/out/lib/${abiVersion}/libfbjni.so",
+                        file: "../libSo/fbjni/jni/${abiVersion}/libfbjni.so",
+                        overwrite: true
+                )
+            }
+        }
+    }
+}
+
+def getCurrentFlavor() {
+    Gradle gradle = getGradle()
+    String taskRequestName = gradle.getStartParameter().getTaskRequests().toString()
+    Pattern pattern = Pattern.compile("(assemble|bundle|install|generate)(\\w*)(Release|Debug)")
+    Matcher matcher = pattern.matcher(taskRequestName)
+
+    if(matcher.find()) {
+        return matcher.group(2)
+    }
+
+    return "NOT-FOUND"
+}
+
+def replaceSoTaskDebug
+def replaceSoTaskRelease
+if(Integer.parseInt(minor) < 65) {
+    tasks.register("replaceSoTaskDebug", replaceSoTask)
+    tasks.register("replaceSoTaskRelease", replaceSoTask)
+    replaceSoTaskDebug = project.getTasks().getByPath(":react-native-reanimated:replaceSoTaskDebug")
+    replaceSoTaskRelease = project.getTasks().getByPath(":react-native-reanimated:replaceSoTaskRelease")
+}
+
+rootProject.getSubprojects().forEach({project ->
+    if (project.plugins.hasPlugin("com.android.application")) {
+        if(project.ext.react.enableHermes) {
+            engine = "hermes"
+        }
+
+        if(project.getProperties().get("android") && Integer.parseInt(minor) < 65) {
+            def projectProperties = project.getProperties()
+            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
+                replaceSoTask.buildDir = project.getProperties().buildDir
+                def appName = project.getProperties().path
+
+                replaceSoTaskDebug.dependsOn(
+                        project.getTasks().getByPath("${appName}:merge${flavorString}DebugNativeLibs"),
+                        project.getTasks().getByPath("${appName}:strip${flavorString}DebugDebugSymbols")
+                )
+                project.getTasks().getByPath("${appName}:package${flavorString}Debug").dependsOn(replaceSoTaskDebug)
+
+                replaceSoTaskRelease.dependsOn(
+                        project.getTasks().getByPath("${appName}:merge${flavorString}ReleaseNativeLibs"),
+                        project.getTasks().getByPath("${appName}:strip${flavorString}ReleaseDebugSymbols")
+                )
+                project.getTasks().getByPath("${appName}:package${flavorString}Release").dependsOn(replaceSoTaskRelease)
+            }
+        }
+    }
+})
+
+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.')
+    }
 }
 
-artifacts.add("default", file("react-native-reanimated-${minor}-${engine}.aar"))
+artifacts.add("default", aar)

package/ios/native/NativeProxy.mm

@@ -8,7 +8,9 @@
 #import <React/RCTFollyConvert.h>
 #import <React/RCTUIManager.h>
 
-#if __has_include(<hermes/hermes.h>)
+#if __has_include(<reacthermes/HermesExecutorFactory.h>)
+#import <reacthermes/HermesExecutorFactory.h>
+#elif __has_include(<hermes/hermes.h>)
 #import <hermes/hermes.h>
 #else
 #import <jsi/JSCRuntime.h>
@@ -111,7 +113,9 @@ std::shared_ptr<NativeReanimatedModule> createReanimatedModule(std::shared_ptr<C
   };
 
 
-#if __has_include(<hermes/hermes.h>)
+#if __has_include(<reacthermes/HermesExecutorFactory.h>)
+  std::unique_ptr<jsi::Runtime> animatedRuntime = facebook::hermes::makeHermesRuntime();
+#elif __has_include(<hermes/hermes.h>)
   std::unique_ptr<jsi::Runtime> animatedRuntime = facebook::hermes::makeHermesRuntime();
 #else
   std::unique_ptr<jsi::Runtime> animatedRuntime = facebook::jsc::makeJSCRuntime();

package/ios/native/REAInitializer.h

@@ -0,0 +1,32 @@
+#import <Foundation/Foundation.h>
+#import <React/RCTCxxBridgeDelegate.h>
+#import <RNReanimated/NativeProxy.h>
+#import <RNReanimated/REAModule.h>
+#import <ReactCommon/RCTTurboModuleManager.h>
+#import <React/RCTBridge+Private.h>
+#import <React/RCTCxxBridgeDelegate.h>
+#import <RNReanimated/REAEventDispatcher.h>
+#import <jsireact/JSIExecutor.h>
+
+#if RNVERSION >= 64
+#import <React/RCTJSIExecutorRuntimeInstaller.h>
+#endif
+
+#if RNVERSION < 63
+#import <ReactCommon/BridgeJSCallInvoker.h>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+namespace reanimated {
+
+using namespace facebook;
+using namespace react;
+
+JSIExecutor::RuntimeInstaller REAJSIExecutorRuntimeInstaller(
+    RCTBridge* bridge,
+    JSIExecutor::RuntimeInstaller runtimeInstallerToWrap
+);
+
+}
+NS_ASSUME_NONNULL_END

package/ios/native/REAInitializer.mm

@@ -0,0 +1,54 @@
+#import "REAInitializer.h"
+
+@interface RCTEventDispatcher(Reanimated)
+
+- (void)setBridge:(RCTBridge*)bridge;
+
+@end
+
+namespace reanimated {
+
+using namespace facebook;
+using namespace react;
+
+JSIExecutor::RuntimeInstaller REAJSIExecutorRuntimeInstaller(
+    RCTBridge* bridge,
+    JSIExecutor::RuntimeInstaller runtimeInstallerToWrap)
+{
+    [bridge moduleForClass:[RCTEventDispatcher class]];
+    RCTEventDispatcher *eventDispatcher = [REAEventDispatcher new];
+    #if RNVERSION >= 66
+    RCTCallableJSModules *callableJSModules = [RCTCallableJSModules new];
+    [bridge setValue:callableJSModules forKey:@"_callableJSModules"];
+    [callableJSModules setBridge:bridge];
+    [eventDispatcher setValue:callableJSModules forKey:@"_callableJSModules"];
+    [eventDispatcher setValue:bridge forKey:@"_bridge"];
+    [eventDispatcher initialize];
+    #else
+    [eventDispatcher setBridge:bridge];
+    #endif
+    [bridge updateModuleWithInstance:eventDispatcher];
+     _bridge_reanimated = bridge;
+    const auto runtimeInstaller = [bridge, runtimeInstallerToWrap](facebook::jsi::Runtime &runtime) {
+      if (!bridge) {
+        return;
+      }
+#if RNVERSION >= 63
+    auto reanimatedModule = reanimated::createReanimatedModule(bridge.jsCallInvoker);
+#else
+    auto callInvoker = std::make_shared<react::BridgeJSCallInvoker>(bridge.reactInstance);
+    auto reanimatedModule = reanimated::createReanimatedModule(callInvoker);
+#endif
+    runtime.global().setProperty(runtime,
+                                 jsi::PropNameID::forAscii(runtime, "__reanimatedModuleProxy"),
+                                 jsi::Object::createFromHostObject(runtime, reanimatedModule));
+        
+        if (runtimeInstallerToWrap) {
+            runtimeInstallerToWrap(runtime);
+        }
+    };
+    return runtimeInstaller;
+}
+
+
+}

package/ios/native/UIResponder+Reanimated.mm

@@ -1,21 +1,10 @@
 #import "UIResponder+Reanimated.h"
-#import <React/RCTCxxBridgeDelegate.h>
-#import <RNReanimated/NativeProxy.h>
-#import <RNReanimated/REAModule.h>
-#import <ReactCommon/RCTTurboModuleManager.h>
-#import <React/RCTBridge+Private.h>
-#import <React/RCTCxxBridgeDelegate.h>
-#import <RNReanimated/REAEventDispatcher.h>
+#import "REAInitializer.h"
 
-#if RNVERSION >= 64
-#import <React/RCTJSIExecutorRuntimeInstaller.h>
-#endif
-
-#if RNVERSION < 63
-#import <ReactCommon/BridgeJSCallInvoker.h>
-#endif
-
-#if __has_include(<React/HermesExecutorFactory.h>)
+#if __has_include(<reacthermes/HermesExecutorFactory.h>)
+#import <reacthermes/HermesExecutorFactory.h>
+typedef HermesExecutorFactory ExecutorFactory;
+#elif __has_include(<React/HermesExecutorFactory.h>)
 #import <React/HermesExecutorFactory.h>
 typedef HermesExecutorFactory ExecutorFactory;
 #else
@@ -25,45 +14,16 @@ typedef JSCExecutorFactory ExecutorFactory;
 
 #ifndef DONT_AUTOINSTALL_REANIMATED
 
-@interface RCTEventDispatcher(Reanimated)
-
-- (void)setBridge:(RCTBridge*)bridge;
-
-@end
-
 @implementation UIResponder (Reanimated)
 - (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:(RCTBridge *)bridge
 {
-  [bridge moduleForClass:[RCTEventDispatcher class]];
-  RCTEventDispatcher *eventDispatcher = [REAEventDispatcher new];
-  [eventDispatcher setBridge:bridge];
-  [bridge updateModuleWithInstance:eventDispatcher];
-   _bridge_reanimated = bridge;
-  __weak __typeof(self) weakSelf = self;
-
-  const auto executor = [weakSelf, bridge](facebook::jsi::Runtime &runtime) {
-    if (!bridge) {
-      return;
-    }
-    __typeof(self) strongSelf = weakSelf;
-    if (strongSelf) {
-#if RNVERSION >= 63
-      auto reanimatedModule = reanimated::createReanimatedModule(bridge.jsCallInvoker);
-#else
-      auto callInvoker = std::make_shared<react::BridgeJSCallInvoker>(bridge.reactInstance);
-      auto reanimatedModule = reanimated::createReanimatedModule(callInvoker);
-#endif
-      runtime.global().setProperty(runtime,
-                                   jsi::PropNameID::forAscii(runtime, "__reanimatedModuleProxy"),
-                                   jsi::Object::createFromHostObject(runtime, reanimatedModule));
-    }
-  };
+  const auto installer = reanimated::REAJSIExecutorRuntimeInstaller(bridge, NULL);
 
 #if RNVERSION >= 64
   // installs globals such as console, nativePerformanceNow, etc.
-  return std::make_unique<ExecutorFactory>(RCTJSIExecutorRuntimeInstaller(executor));
+  return std::make_unique<ExecutorFactory>(RCTJSIExecutorRuntimeInstaller(installer));
 #else
-  return std::make_unique<ExecutorFactory>(executor);
+  return std::make_unique<ExecutorFactory>(installer);
 #endif
 }
 

package/lib/reanimated1/core/Core.test.js

@@ -0,0 +1,30 @@
+import React from 'react';
+import Animated from '../../Animated';
+
+import renderer from 'react-test-renderer';
+
+jest.mock('../../ReanimatedEventEmitter');
+jest.mock('../../ReanimatedModule');
+jest.mock('../../reanimated2/NativeReanimated');
+
+describe('Core Animated components', () => {
+  xit('fails if something other then a node or function that returns a node is passed to Animated.Code exec prop', () => {
+    console.error = jest.fn();
+
+    expect(() =>
+      renderer.create(<Animated.Code exec="not a node" />)
+    ).toThrowError(
+      "<Animated.Code /> expects the 'exec' prop or children to be an animated node or a function returning an animated node."
+    );
+  });
+
+  xit('fails if something other then a node or function that returns a node is passed to Animated.Code children', () => {
+    console.error = jest.fn();
+
+    expect(() =>
+      renderer.create(<Animated.Code>not a node</Animated.Code>)
+    ).toThrowError(
+      "<Animated.Code /> expects the 'exec' prop or children to be an animated node or a function returning an animated node."
+    );
+  });
+});

package/lib/reanimated2/core.js

@@ -30,7 +30,7 @@ export const isConfigured = (throwError = false) => {
 };
 export const isConfiguredCheck = () => {
     if (!isConfigured(true)) {
-        throw new Error('If you want to use Reanimated 2 then go through our installation steps https://docs.swmansion.com/react-native-reanimated/docs/installation');
+        throw new Error('If you want to use Reanimated 2 then go through our installation steps https://docs.swmansion.com/react-native-reanimated/docs/fundamentals/installation');
     }
 };
 function _toArrayReanimated(object) {

package/lib/reanimated2/js-reanimated/index.web.js

@@ -11,9 +11,15 @@ export const _updatePropsJS = (_viewTag, _viewName, updates, viewRef) => {
             acc[index][key] = value;
             return acc;
         }, [{}, {}]);
-        viewRef.current._component.setNativeProps({ style: rawStyles });
+        setNativeProps(viewRef._component, rawStyles);
     }
 };
+const setNativeProps = (component, style) => {
+    const previousStyle = component.previousStyle ? component.previousStyle : {};
+    const currentStyle = Object.assign(Object.assign({}, previousStyle), style);
+    component.previousStyle = currentStyle;
+    component.setNativeProps({ style: currentStyle });
+};
 global._setGlobalConsole = (_val) => {
     // noop
 };

package/lib/reanimated2/platform-specific/RNRenderer.web.js

@@ -1 +1,3 @@
 "use strict";
+// RNRender is not used for web. An export is still defined to eliminate warnings from bundlers such as esbuild.
+module.exports = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-reanimated",
-  "version": "2.2.0",
+  "version": "2.2.4",
   "description": "More powerful alternative to Animated library for React Native.",
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",
@@ -24,6 +24,7 @@
     "Common/",
     "src/",
     "lib/",
+    "libSo/",
     "android/src/main/AndroidManifest.xml",
     "android/src/main/java/",
     "android/build.gradle",
@@ -80,7 +81,7 @@
     "@types/babel__generator": "^7.6.2",
     "@types/babel__traverse": "^7.0.15",
     "@types/jest": "^26.0.15",
-    "@types/react-native": "^0.64.2",
+    "@types/react-native": "^0.66.1",
     "@typescript-eslint/eslint-plugin": "^4.15.1",
     "@typescript-eslint/parser": "^4.15.1",
     "babel-eslint": "^10.0.3",
@@ -99,7 +100,7 @@
     "lint-staged": "^10.2.11",
     "prettier": "^2.2.1",
     "react": "17.0.1",
-    "react-native": "0.64.1",
+    "react-native": "0.67.0-rc.2",
     "react-native-gesture-handler": "^1.6.1",
     "react-test-renderer": "17.0.1",
     "release-it": "^13.1.1",

package/src/reanimated1/core/Core.test.js

@@ -0,0 +1,30 @@
+import React from 'react';
+import Animated from '../../Animated';
+
+import renderer from 'react-test-renderer';
+
+jest.mock('../../ReanimatedEventEmitter');
+jest.mock('../../ReanimatedModule');
+jest.mock('../../reanimated2/NativeReanimated');
+
+describe('Core Animated components', () => {
+  xit('fails if something other then a node or function that returns a node is passed to Animated.Code exec prop', () => {
+    console.error = jest.fn();
+
+    expect(() =>
+      renderer.create(<Animated.Code exec="not a node" />)
+    ).toThrowError(
+      "<Animated.Code /> expects the 'exec' prop or children to be an animated node or a function returning an animated node."
+    );
+  });
+
+  xit('fails if something other then a node or function that returns a node is passed to Animated.Code children', () => {
+    console.error = jest.fn();
+
+    expect(() =>
+      renderer.create(<Animated.Code>not a node</Animated.Code>)
+    ).toThrowError(
+      "<Animated.Code /> expects the 'exec' prop or children to be an animated node or a function returning an animated node."
+    );
+  });
+});

package/src/reanimated2/core.ts

@@ -39,7 +39,7 @@ export const isConfigured = (throwError = false) => {
 export const isConfiguredCheck = () => {
   if (!isConfigured(true)) {
     throw new Error(
-      'If you want to use Reanimated 2 then go through our installation steps https://docs.swmansion.com/react-native-reanimated/docs/installation'
+      'If you want to use Reanimated 2 then go through our installation steps https://docs.swmansion.com/react-native-reanimated/docs/fundamentals/installation'
     );
   }
 };

package/src/reanimated2/js-reanimated/index.web.ts

@@ -18,10 +18,17 @@ export const _updatePropsJS = (_viewTag, _viewName, updates, viewRef) => {
       [{}, {}]
     );
 
-    viewRef.current._component.setNativeProps({ style: rawStyles });
+    setNativeProps(viewRef._component, rawStyles);
   }
 };
 
+const setNativeProps = (component, style) => {
+  const previousStyle = component.previousStyle ? component.previousStyle : {};
+  const currentStyle = { ...previousStyle, ...style };
+  component.previousStyle = currentStyle;
+  component.setNativeProps({ style: currentStyle });
+};
+
 global._setGlobalConsole = (_val) => {
   // noop
 };

package/src/reanimated2/platform-specific/RNRenderer.web.ts

@@ -0,0 +1,2 @@
+// RNRender is not used for web. An export is still defined to eliminate warnings from bundlers such as esbuild.
+module.exports = null;