react-native-reanimated 3.15.3 → 3.15.5

package/Common/cpp/reanimated/NativeModules/NativeReanimatedModule.cpp

@@ -32,6 +32,18 @@
 #include <fbjni/fbjni.h>
 #endif
 
+// Standard `__cplusplus` macro reference:
+// https://en.cppreference.com/w/cpp/preprocessor/replace#Predefined_macros
+#if REACT_NATIVE_MINOR_VERSION >= 75 || __cplusplus >= 202002L
+// Implicit copy capture of `this` is deprecated in NDK27, which uses C++20.
+#define COPY_CAPTURE_WITH_THIS [ =, this ] // NOLINT (whitespace/braces)
+#else
+// React Native 0.75 is the last one which allows NDK23. NDK23 uses C++17 and
+// explicitly disallows C++20 features, including the syntax above. Therefore we
+// fallback to the deprecated syntax here.
+#define COPY_CAPTURE_WITH_THIS [=] // NOLINT (whitespace/braces)
+#endif // REACT_NATIVE_MINOR_VERSION >= 75 || __cplusplus >= 202002L
+
 using namespace facebook;
 
 #if REACT_NATIVE_MINOR_VERSION == 73 && defined(RCT_NEW_ARCH_ENABLED)
@@ -195,13 +207,13 @@ void NativeReanimatedModule::scheduleOnUI(
     const jsi::Value &worklet) {
   auto shareableWorklet = extractShareableOrThrow<ShareableWorklet>(
       rt, worklet, "[Reanimated] Only worklets can be scheduled to run on UI.");
-  uiScheduler_->scheduleOnUI([=, this] {
+  uiScheduler_->scheduleOnUI(COPY_CAPTURE_WITH_THIS {
 #if JS_RUNTIME_HERMES
-    // JSI's scope defined here allows for JSI-objects to be cleared up after
-    // each runtime loop. Within these loops we typically create some temporary
-    // JSI objects and hence it allows for such objects to be garbage collected
-    // much sooner.
-    // Apparently the scope API is only supported on Hermes at the moment.
+    // JSI's scope defined here allows for JSI-objects to be cleared up
+    // after each runtime loop. Within these loops we typically create some
+    // temporary JSI objects and hence it allows for such objects to be
+    // garbage collected much sooner. Apparently the scope API is only
+    // supported on Hermes at the moment.
     const auto scope = jsi::Scope(uiWorkletRuntime_->getJSIRuntime());
 #endif
     uiWorkletRuntime_->runGuarded(shareableWorklet);
@@ -261,7 +273,7 @@ jsi::Value NativeReanimatedModule::registerEventHandler(
       rt, worklet, "[Reanimated] Event handler must be a worklet.");
   int emitterReactTagInt = emitterReactTag.asNumber();
 
-  uiScheduler_->scheduleOnUI([=, this] {
+  uiScheduler_->scheduleOnUI(COPY_CAPTURE_WITH_THIS {
     auto handler = std::make_shared<WorkletEventHandler>(
         newRegistrationId, eventNameStr, emitterReactTagInt, handlerShareable);
     eventHandlerRegistry_->registerEventHandler(std::move(handler));
@@ -275,7 +287,9 @@ void NativeReanimatedModule::unregisterEventHandler(
     const jsi::Value &registrationId) {
   uint64_t id = registrationId.asNumber();
   uiScheduler_->scheduleOnUI(
-      [=, this] { eventHandlerRegistry_->unregisterEventHandler(id); });
+      COPY_CAPTURE_WITH_THIS
+
+      { eventHandlerRegistry_->unregisterEventHandler(id); });
 }
 
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -371,20 +385,23 @@ jsi::Value NativeReanimatedModule::getViewProp(
 
   const int viewTagInt = viewTag.asNumber();
 
-  uiScheduler_->scheduleOnUI([=, this]() {
-    jsi::Runtime &uiRuntime = uiWorkletRuntime_->getJSIRuntime();
-    const jsi::Value propNameValue =
-        jsi::String::createFromUtf8(uiRuntime, propNameStr);
-    const auto resultValue =
-        obtainPropFunction_(uiRuntime, viewTagInt, propNameValue);
-    const auto resultStr = resultValue.asString(uiRuntime).utf8(uiRuntime);
-
-    jsScheduler_->scheduleOnJS([=](jsi::Runtime &rnRuntime) {
-      const auto resultValue =
-          jsi::String::createFromUtf8(rnRuntime, resultStr);
-      funPtr->call(rnRuntime, resultValue);
-    });
-  });
+  uiScheduler_->scheduleOnUI(
+      COPY_CAPTURE_WITH_THIS
+
+      () {
+        jsi::Runtime &uiRuntime = uiWorkletRuntime_->getJSIRuntime();
+        const jsi::Value propNameValue =
+            jsi::String::createFromUtf8(uiRuntime, propNameStr);
+        const auto resultValue =
+            obtainPropFunction_(uiRuntime, viewTagInt, propNameValue);
+        const auto resultStr = resultValue.asString(uiRuntime).utf8(uiRuntime);
+
+        jsScheduler_->scheduleOnJS([=](jsi::Runtime &rnRuntime) {
+          const auto resultValue =
+              jsi::String::createFromUtf8(rnRuntime, resultStr);
+          funPtr->call(rnRuntime, resultValue);
+        });
+      });
   return jsi::Value::undefined();
 }
 
@@ -872,7 +889,9 @@ jsi::Value NativeReanimatedModule::subscribeForKeyboardEvents(
       handlerWorklet,
       "[Reanimated] Keyboard event handler must be a worklet.");
   return subscribeForKeyboardEventsFunction_(
-      [=, this](int keyboardState, int height) {
+      COPY_CAPTURE_WITH_THIS
+
+      (int keyboardState, int height) {
         uiWorkletRuntime_->runGuarded(
             shareableHandler, jsi::Value(keyboardState), jsi::Value(height));
       },

package/lib/module/platform-specific/jsVersion.js

@@ -5,5 +5,5 @@
  * with the version used to build the native part of the library in runtime.
  * Remember to keep this in sync with the version declared in `package.json`
  */
-export const jsVersion = '3.15.3';
+export const jsVersion = '3.15.5';
 //# sourceMappingURL=jsVersion.js.map

package/lib/module/platform-specific/jsVersion.js.map

@@ -1 +1 @@
-{"version":3,"names":["jsVersion"],"sources":["jsVersion.ts"],"sourcesContent":["'use strict';\n/**\n * We hardcode the version of Reanimated here in order to compare it\n * with the version used to build the native part of the library in runtime.\n * Remember to keep this in sync with the version declared in `package.json`\n */\nexport const jsVersion = '3.15.3';\n"],"mappings":"AAAA,YAAY;;AACZ;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMA,SAAS,GAAG,QAAQ","ignoreList":[]}
+{"version":3,"names":["jsVersion"],"sources":["jsVersion.ts"],"sourcesContent":["'use strict';\n/**\n * We hardcode the version of Reanimated here in order to compare it\n * with the version used to build the native part of the library in runtime.\n * Remember to keep this in sync with the version declared in `package.json`\n */\nexport const jsVersion = '3.15.5';\n"],"mappings":"AAAA,YAAY;;AACZ;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMA,SAAS,GAAG,QAAQ","ignoreList":[]}

package/lib/typescript/platform-specific/jsVersion.d.ts

@@ -3,4 +3,4 @@
  * with the version used to build the native part of the library in runtime.
  * Remember to keep this in sync with the version declared in `package.json`
  */
-export declare const jsVersion = "3.15.3";
+export declare const jsVersion = "3.15.5";

package/package.json

@@ -1,34 +1,30 @@
 {
   "name": "react-native-reanimated",
-  "version": "3.15.3",
+  "version": "3.15.5",
   "description": "More powerful alternative to Animated library for React Native.",
   "scripts": {
-    "test": "yarn format:js && yarn lint:js && yarn test:unit",
-    "test:unit": "jest",
-    "test:update-snapshot": "jest --updateSnapshot",
-    "lint": "yarn lint:js && yarn lint:plugin && yarn lint:cpp && yarn lint:java && yarn lint:ios",
+    "test": "jest",
+    "lint": "yarn lint:js && yarn lint:plugin && yarn lint:common && yarn lint:android && yarn lint:apple",
     "lint:js": "eslint --ext '.js,.ts,.tsx' src __tests__ __typetests__ && yarn prettier --check src __tests__ __typetests__",
-    "lint:plugin": "cd plugin && yarn lint && cd ..",
-    "lint:docs": "cd docs && yarn lint && cd ..",
-    "lint:java": "./android/gradlew -p android spotlessCheck -q",
-    "lint:cpp": "./scripts/cpplint.sh",
-    "lint:ios": "./scripts/validate-ios.sh && yarn format:ios --dry-run",
-    "format": "yarn format:js && yarn format:plugin && yarn format:java && yarn format:ios && yarn format:android && yarn format:common",
+    "lint:plugin": "cd plugin && yarn lint",
+    "lint:android": "./android/gradlew -p android spotlessCheck -q && yarn format:android:cpp --dry-run -Werror",
+    "lint:common": "./scripts/cpplint.sh Common && yarn format:common --dry-run -Werror",
+    "lint:apple": "yarn format:apple --dry-run -Werror",
+    "format": "yarn format:js && yarn format:plugin && yarn format:apple && yarn format:android:java && yarn format:android:cpp && yarn format:common",
     "format:js": "prettier --write --list-different src __tests__ __typetests__",
     "format:plugin": "cd plugin && yarn format",
-    "format:java": "node ./scripts/format-java.js",
-    "format:ios": "find apple/ -iname \"*.h\" -o -iname \"*.m\" -o -iname \"*.mm\" -o -iname \"*.cpp\" | xargs clang-format -i --Werror",
-    "format:android": "find android/src/ -iname \"*.h\" -o -iname \"*.cpp\" | xargs clang-format -i",
-    "format:common": "find Common/ -iname \"*.h\" -o -iname \"*.cpp\" | xargs clang-format -i",
-    "format:docs": "cd docs && yarn format",
+    "format:apple": "find apple -iname \"*.h\" -o -iname \"*.m\" -o -iname \"*.mm\" -o -iname \"*.cpp\" | xargs clang-format -i",
+    "format:android:java": "node ./scripts/format-java.js",
+    "format:android:cpp": "find android/src -iname \"*.h\" -o -iname \"*.cpp\" | xargs clang-format -i",
+    "format:common": "find Common -iname \"*.h\" -o -iname \"*.cpp\" | xargs clang-format -i",
     "find-unused-code:js": "yarn ts-prune --ignore \"index|.web.\" --error",
+    "type:check": "yarn type:check:src && yarn type:check:plugin && ./scripts/test-ts.sh ../../apps/common-app/src/App.tsx __typetests__/common __typetests__/72plus __typetests__/legacy",
     "type:check:src": "yarn tsc --noEmit",
-    "type:check:plugin": "cd plugin && yarn type:check:src && cd ..",
+    "type:check:plugin": "cd plugin && yarn type:check:src",
     "type:check:app": "./scripts/test-ts.sh ../../apps/common-app/src/App.tsx",
     "type:check:tests:common": "./scripts/test-ts.sh __typetests__/common",
     "type:check:tests:0.72+": "./scripts/test-ts.sh __typetests__/72plus",
     "type:check:tests:legacy": "./scripts/test-ts.sh __typetests__/legacy",
-    "type:check:all": "yarn type:check:src && yarn type:check:plugin && ./scripts/test-ts.sh ../../apps/common-app/src/App.tsx __typetests__/common __typetests__/72plus __typetests__/legacy",
     "build": "yarn build:plugin && bob build",
     "build:plugin": "cd plugin && yarn install && yarn build",
     "circular-dependency-check": "yarn madge --extensions js,ts,tsx --circular src lib",

package/src/platform-specific/jsVersion.ts

@@ -4,4 +4,4 @@
  * with the version used to build the native part of the library in runtime.
  * Remember to keep this in sync with the version declared in `package.json`
  */
-export const jsVersion = '3.15.3';
+export const jsVersion = '3.15.5';