Skip to content

Commit 8d87d22

Browse files
MonilBhavsarOSBotify
authored andcommitted
Merge pull request #44555 from Expensify/vit-patch44437
[CP Staging] Skip ReanimatedCommitMarker assertion in RNReanimated (cherry picked from commit 4af2b3f)
1 parent dac6363 commit 8d87d22

File tree

1 file changed

+36
-0
lines changed

1 file changed

+36
-0
lines changed
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
diff --git a/node_modules/react-native-reanimated/Common/cpp/Fabric/ReanimatedCommitMarker.cpp b/node_modules/react-native-reanimated/Common/cpp/Fabric/ReanimatedCommitMarker.cpp
2+
index 3404e89..b545cb6 100644
3+
--- a/node_modules/react-native-reanimated/Common/cpp/Fabric/ReanimatedCommitMarker.cpp
4+
+++ b/node_modules/react-native-reanimated/Common/cpp/Fabric/ReanimatedCommitMarker.cpp
5+
@@ -9,7 +9,7 @@ namespace reanimated {
6+
thread_local bool ReanimatedCommitMarker::reanimatedCommitFlag_{false};
7+
8+
ReanimatedCommitMarker::ReanimatedCommitMarker() {
9+
- react_native_assert(reanimatedCommitFlag_ != true);
10+
+ // react_native_assert(reanimatedCommitFlag_ != true);
11+
reanimatedCommitFlag_ = true;
12+
}
13+
14+
diff --git a/node_modules/react-native-reanimated/lib/module/reanimated2/UpdateProps.js b/node_modules/react-native-reanimated/lib/module/reanimated2/UpdateProps.js
15+
index e69c581..78b7034 100644
16+
--- a/node_modules/react-native-reanimated/lib/module/reanimated2/UpdateProps.js
17+
+++ b/node_modules/react-native-reanimated/lib/module/reanimated2/UpdateProps.js
18+
@@ -7,14 +7,11 @@ import { isFabric, isJest, shouldBeUseWeb } from './PlatformChecker';
19+
import { runOnUIImmediately } from './threads';
20+
let updateProps;
21+
if (shouldBeUseWeb()) {
22+
- updateProps = (_, updates, maybeViewRef, isAnimatedProps) => {
23+
+ updateProps = (viewDescriptorsSet, updates, maybeViewRef, isAnimatedProps) => {
24+
'worklet';
25+
-
26+
- if (maybeViewRef) {
27+
- maybeViewRef.items.forEach((item, _index) => {
28+
- _updatePropsJS(updates, item, isAnimatedProps);
29+
- });
30+
- }
31+
+ viewDescriptorsSet.value.forEach((viewDescriptor) => {
32+
+ _updatePropsJS(updates, {_component: viewDescriptor.tag}, isAnimatedProps);
33+
+ })
34+
};
35+
} else {
36+
updateProps = (viewDescriptors, updates) => {

0 commit comments

Comments
 (0)