react-native-reanimated 2.2.3 → 2.2.4

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,15 @@ 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.')
+    }
+}
+
+artifacts.add("default", aar)

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.3",
+  "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",
@@ -81,7 +81,7 @@
     "@types/babel__generator": "^7.6.2",
     "@types/babel__traverse": "^7.0.15",
     "@types/jest": "^26.0.15",
-    "@types/react-native": "^0.65.5",
+    "@types/react-native": "^0.66.1",
     "@typescript-eslint/eslint-plugin": "^4.15.1",
     "@typescript-eslint/parser": "^4.15.1",
     "babel-eslint": "^10.0.3",
@@ -100,7 +100,7 @@
     "lint-staged": "^10.2.11",
     "prettier": "^2.2.1",
     "react": "17.0.1",
-    "react-native": "0.66.0",
+    "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/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;