Resolve merge conflict

Expensify · Jun 27, 2024 · 7bfac37 · 7bfac37
1 parent 8d87d22
commit 7bfac37
Showing 1 changed file with 1 addition and 24 deletions.
diff --git a/patches/react-native-reanimated+3.8.1+003+fix-strict-mode.patch b/patches/react-native-reanimated+3.8.1+003+fix-strict-mode.patch
@@ -10,27 +10,4 @@ index 3404e89..b545cb6 100644
 +  // react_native_assert(reanimatedCommitFlag_ != true);
    reanimatedCommitFlag_ = true;
  }
-
-diff --git a/node_modules/react-native-reanimated/lib/module/reanimated2/UpdateProps.js b/node_modules/react-native-reanimated/lib/module/reanimated2/UpdateProps.js
-index e69c581..78b7034 100644
---- a/node_modules/react-native-reanimated/lib/module/reanimated2/UpdateProps.js
-+++ b/node_modules/react-native-reanimated/lib/module/reanimated2/UpdateProps.js
-@@ -7,14 +7,11 @@ import { isFabric, isJest, shouldBeUseWeb } from './PlatformChecker';
- import { runOnUIImmediately } from './threads';
- let updateProps;
- if (shouldBeUseWeb()) {
--  updateProps = (_, updates, maybeViewRef, isAnimatedProps) => {
-+  updateProps = (viewDescriptorsSet, updates, maybeViewRef, isAnimatedProps) => {
-     'worklet';
--
--    if (maybeViewRef) {
--      maybeViewRef.items.forEach((item, _index) => {
--        _updatePropsJS(updates, item, isAnimatedProps);
--      });
--    }
-+    viewDescriptorsSet.value.forEach((viewDescriptor) => {
-+      _updatePropsJS(updates, {_component: viewDescriptor.tag}, isAnimatedProps);
-+    })
-   };
- } else {
-   updateProps = (viewDescriptors, updates) => {
+