Skip to content

Commit 4add399

Browse files
MatiPl01MatiPl01
committed
Some progress
1 parent 27980e5 commit 4add399

File tree

10 files changed

+23
-322
lines changed

10 files changed

+23
-322
lines changed

‎apps/common-app/package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,8 @@
3030
"d3-shape": "^3.2.0",
3131
"eslint-plugin-reanimated": "workspace:*",
3232
"react": "18.3.1",
33-
"react-native-gesture-handler": "2.22.0",
34-
"react-native-pager-view": "6.6.1",
3533
"react-native-reanimated": "workspace:*",
3634
"react-native-safe-area-context": "5.2.0-beta.0",
37-
"react-native-screens": "4.6.0-beta.1",
38-
"react-native-svg": "15.11.1",
3935
"react-strict-dom": "0.0.27"
4036
},
4137
"devDependencies": {

‎apps/fabric-example/ios/Podfile.lock

Lines changed: 0 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1869,94 +1869,6 @@ PODS:
18691869
- ReactCommon/turbomodule/bridging
18701870
- ReactCommon/turbomodule/core
18711871
- Yoga
1872-
- RNScreens (4.6.0-beta.1):
1873-
- DoubleConversion
1874-
- glog
1875-
- hermes-engine
1876-
- RCT-Folly (= 2024.11.18.00)
1877-
- RCTRequired
1878-
- RCTTypeSafety
1879-
- React-Core
1880-
- React-debug
1881-
- React-Fabric
1882-
- React-featureflags
1883-
- React-graphics
1884-
- React-ImageManager
1885-
- React-NativeModulesApple
1886-
- React-RCTFabric
1887-
- React-RCTImage
1888-
- React-rendererdebug
1889-
- React-utils
1890-
- ReactCodegen
1891-
- ReactCommon/turbomodule/bridging
1892-
- ReactCommon/turbomodule/core
1893-
- RNScreens/common (= 4.6.0-beta.1)
1894-
- Yoga
1895-
- RNScreens/common (4.6.0-beta.1):
1896-
- DoubleConversion
1897-
- glog
1898-
- hermes-engine
1899-
- RCT-Folly (= 2024.11.18.00)
1900-
- RCTRequired
1901-
- RCTTypeSafety
1902-
- React-Core
1903-
- React-debug
1904-
- React-Fabric
1905-
- React-featureflags
1906-
- React-graphics
1907-
- React-ImageManager
1908-
- React-NativeModulesApple
1909-
- React-RCTFabric
1910-
- React-RCTImage
1911-
- React-rendererdebug
1912-
- React-utils
1913-
- ReactCodegen
1914-
- ReactCommon/turbomodule/bridging
1915-
- ReactCommon/turbomodule/core
1916-
- Yoga
1917-
- RNSVG (15.11.1):
1918-
- DoubleConversion
1919-
- glog
1920-
- hermes-engine
1921-
- RCT-Folly (= 2024.11.18.00)
1922-
- RCTRequired
1923-
- RCTTypeSafety
1924-
- React-Core
1925-
- React-debug
1926-
- React-Fabric
1927-
- React-featureflags
1928-
- React-graphics
1929-
- React-ImageManager
1930-
- React-NativeModulesApple
1931-
- React-RCTFabric
1932-
- React-rendererdebug
1933-
- React-utils
1934-
- ReactCodegen
1935-
- ReactCommon/turbomodule/bridging
1936-
- ReactCommon/turbomodule/core
1937-
- RNSVG/common (= 15.11.1)
1938-
- Yoga
1939-
- RNSVG/common (15.11.1):
1940-
- DoubleConversion
1941-
- glog
1942-
- hermes-engine
1943-
- RCT-Folly (= 2024.11.18.00)
1944-
- RCTRequired
1945-
- RCTTypeSafety
1946-
- React-Core
1947-
- React-debug
1948-
- React-Fabric
1949-
- React-featureflags
1950-
- React-graphics
1951-
- React-ImageManager
1952-
- React-NativeModulesApple
1953-
- React-RCTFabric
1954-
- React-rendererdebug
1955-
- React-utils
1956-
- ReactCodegen
1957-
- ReactCommon/turbomodule/bridging
1958-
- ReactCommon/turbomodule/core
1959-
- Yoga
19601872
- SocketRocket (0.7.1)
19611873
- Yoga (0.0.0)
19621874

@@ -2037,8 +1949,6 @@ DEPENDENCIES:
20371949
- "RNFlashList (from `../../../node_modules/@shopify/flash-list`)"
20381950
- RNGestureHandler (from `../../../node_modules/react-native-gesture-handler`)
20391951
- RNReanimated (from `../../../node_modules/react-native-reanimated`)
2040-
- RNScreens (from `../../../node_modules/react-native-screens`)
2041-
- RNSVG (from `../../../node_modules/react-native-svg`)
20421952
- Yoga (from `../../../node_modules/react-native/ReactCommon/yoga`)
20431953

20441954
SPEC REPOS:
@@ -2195,10 +2105,6 @@ EXTERNAL SOURCES:
21952105
:path: "../../../node_modules/react-native-gesture-handler"
21962106
RNReanimated:
21972107
:path: "../../../node_modules/react-native-reanimated"
2198-
RNScreens:
2199-
:path: "../../../node_modules/react-native-screens"
2200-
RNSVG:
2201-
:path: "../../../node_modules/react-native-svg"
22022108
Yoga:
22032109
:path: "../../../node_modules/react-native/ReactCommon/yoga"
22042110

@@ -2277,8 +2183,6 @@ SPEC CHECKSUMS:
22772183
RNFlashList: b799a0cdd1189c1f5064331548400dd79a7e3047
22782184
RNGestureHandler: 70069ab3e0431b03f6e465b65745f87a1a02c6c0
22792185
RNReanimated: 86e832345ac6d26ff5ca8635652f2632c62e9e54
2280-
RNScreens: f7e0f652dba8c00fef4674a02a42a55088f5ffdf
2281-
RNSVG: 7cabd04bfca7d0d873f16ff9c216626ea1c8cd17
22822186
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
22832187
Yoga: d7af68bbe88ef55fd73754fe6942746eff12919c
22842188

‎apps/macos-example/macos/MacOSExample.xcodeproj/project.pbxproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,6 @@
292292
"${PODS_ROOT}/Target Support Files/Pods-MacOSExample-macOS/Pods-MacOSExample-macOS-resources.sh",
293293
"${PODS_CONFIGURATION_BUILD_DIR}/RCT-Folly/RCT-Folly_privacy.bundle",
294294
"${PODS_CONFIGURATION_BUILD_DIR}/RNCAsyncStorage/RNCAsyncStorage_resources.bundle",
295-
"${PODS_CONFIGURATION_BUILD_DIR}/RNSVG/RNSVGFilters.bundle",
296295
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/React-Core_privacy.bundle",
297296
"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React-cxxreact_privacy.bundle",
298297
"${PODS_CONFIGURATION_BUILD_DIR}/boost/boost_privacy.bundle",
@@ -302,7 +301,6 @@
302301
outputPaths = (
303302
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCT-Folly_privacy.bundle",
304303
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNCAsyncStorage_resources.bundle",
305-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNSVGFilters.bundle",
306304
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-Core_privacy.bundle",
307305
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-cxxreact_privacy.bundle",
308306
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/boost_privacy.bundle",

‎apps/macos-example/macos/Podfile.lock

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,7 +1210,7 @@ PODS:
12101210
- ReactCommon/turbomodule/bridging
12111211
- ReactCommon/turbomodule/core
12121212
- Yoga
1213-
- react-native-safe-area-context (5.1.0):
1213+
- react-native-safe-area-context (5.2.0-beta.0):
12141214
- React-Core
12151215
- React-nativeconfig (0.75.16)
12161216
- React-NativeModulesApple (0.75.16):
@@ -1589,8 +1589,6 @@ PODS:
15891589
- ReactCommon/turbomodule/bridging
15901590
- ReactCommon/turbomodule/core
15911591
- Yoga
1592-
- RNSVG (15.11.1):
1593-
- React-Core
15941592
- SocketRocket (0.7.0)
15951593
- Yoga (0.0.0)
15961594

@@ -1661,7 +1659,6 @@ DEPENDENCIES:
16611659
- "RNCClipboard (from `../../../node_modules/@react-native-clipboard/clipboard`)"
16621660
- RNGestureHandler (from `../../../node_modules/react-native-gesture-handler`)
16631661
- RNReanimated (from `../node_modules/react-native-reanimated`)
1664-
- RNSVG (from `../../../node_modules/react-native-svg`)
16651662
- SocketRocket (from `../node_modules/react-native-macos/third-party-podspecs/SocketRocket.podspec`)
16661663
- Yoga (from `../node_modules/react-native-macos/ReactCommon/yoga`)
16671664

@@ -1794,8 +1791,6 @@ EXTERNAL SOURCES:
17941791
:path: "../../../node_modules/react-native-gesture-handler"
17951792
RNReanimated:
17961793
:path: "../node_modules/react-native-reanimated"
1797-
RNSVG:
1798-
:path: "../../../node_modules/react-native-svg"
17991794
SocketRocket:
18001795
:podspec: "../node_modules/react-native-macos/third-party-podspecs/SocketRocket.podspec"
18011796
Yoga:
@@ -1836,7 +1831,7 @@ SPEC CHECKSUMS:
18361831
React-logger: d2346d2c6056e50941ee0e91db9639188842fe34
18371832
React-Mapbuffer: 42c1c6a2fcfc7993c96fd1540993ec5070fc870f
18381833
React-microtasksnativemodule: 74040ecf5ffab05e7276a3c73bc6aa423e152c1b
1839-
react-native-safe-area-context: e134b241010ebe2aacdcea013565963d13826faa
1834+
react-native-safe-area-context: 173688ed63d15920de28a80e02300d415399adb8
18401835
React-nativeconfig: 33b8222107c5eb4b73b9cd6d28397ab123904d5c
18411836
React-NativeModulesApple: 89541f2dd4928c7a6e40a01a7771664e1ff61066
18421837
React-perflogger: 4ef0d0f93248f8331d7de7824e4b7b34d9740147
@@ -1866,7 +1861,6 @@ SPEC CHECKSUMS:
18661861
RNCClipboard: ee059e6006b137e369caed5eb852b4aad9f5d886
18671862
RNGestureHandler: 8c8722468ee6ced80a0723943c894798d2613a81
18681863
RNReanimated: 5e21c891ee78aa03ffbd0ce2c8d15a7c263f499f
1869-
RNSVG: 46769c92d1609e617dbf9326ad8a0cff912d0982
18701864
SocketRocket: 9ee265c4b5ae2382d18e4ee1d2dd2d7af0ff1ab5
18711865
Yoga: 446e6f351a519539ff00a1159fe41e589aab1b94
18721866

‎packages/docs-reanimated/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
"react-dom": "^17.0.2",
4343
"react-draggable": "^4.4.5",
4444
"react-native": "^0.71.4",
45-
"react-native-gesture-handler": "2.18.0",
4645
"react-native-reanimated": "./react-native-reanimated-4.0.0-beta.1.tgz",
4746
"react-native-svg": "15.4.0",
4847
"react-native-web": "^0.18.12",

‎packages/react-native-reanimated/Common/cpp/reanimated/LayoutAnimations/LayoutAnimationsProxy.cpp

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ void LayoutAnimationsProxy::parseRemoveMutations(
153153
if (mutation.type == ShadowViewMutation::Remove) {
154154
updateIndexForMutation(mutation);
155155
auto tag = mutation.oldChildShadowView.tag;
156-
auto parentTag = mutation.parentShadowView.tag;
156+
auto parentTag = mutation.parentTag;
157157
auto unflattenedParentTag = parentTag; // temporary
158158

159159
std::shared_ptr<MutationNode> mutationNode;
@@ -287,17 +287,16 @@ void LayoutAnimationsProxy::handleUpdatesAndEnterings(
287287
}
288288
case ShadowViewMutation::Type::Insert: {
289289
updateIndexForMutation(mutation);
290-
if (nodeForTag_.contains(mutation.parentShadowView.tag)) {
291-
nodeForTag_[mutation.parentShadowView.tag]->applyMutationToIndices(
292-
mutation);
290+
if (nodeForTag_.contains(mutation.parentTag)) {
291+
nodeForTag_[mutation.parentTag]->applyMutationToIndices(mutation);
293292
}
294293

295294
if (movedViews.contains(tag)) {
296295
auto layoutAnimationIt = layoutAnimations_.find(tag);
297296
if (layoutAnimationIt == layoutAnimations_.end()) {
298297
if (oldShadowViewsForReparentings.contains(tag)) {
299298
filteredMutations.push_back(ShadowViewMutation::InsertMutation(
300-
mutation.parentShadowView,
299+
mutation.parentTag,
301300
oldShadowViewsForReparentings[tag],
302301
mutation.index));
303302
} else {
@@ -308,7 +307,7 @@ void LayoutAnimationsProxy::handleUpdatesAndEnterings(
308307

309308
auto oldView = *layoutAnimationIt->second.currentView;
310309
filteredMutations.push_back(ShadowViewMutation::InsertMutation(
311-
mutation.parentShadowView, oldView, mutation.index));
310+
mutation.parentTag, oldView, mutation.index));
312311
continue;
313312
}
314313

@@ -328,7 +327,7 @@ void LayoutAnimationsProxy::handleUpdatesAndEnterings(
328327
cloneViewWithoutOpacity(mutation, propsParserContext);
329328

330329
filteredMutations.push_back(ShadowViewMutation::UpdateMutation(
331-
mutation.newChildShadowView, *newView, mutation.parentShadowView));
330+
mutation.newChildShadowView, *newView, mutation.parentTag));
332331
break;
333332
}
334333

@@ -386,7 +385,7 @@ void LayoutAnimationsProxy::addOngoingAnimations(
386385
updateLayoutMetrics(newView->layoutMetrics, updateValues.frame);
387386

388387
mutations.push_back(ShadowViewMutation::UpdateMutation(
389-
*layoutAnimation.currentView, *newView, *layoutAnimation.parentView));
388+
*layoutAnimation.currentView, *newView, layoutAnimation.parentTag));
390389
layoutAnimation.currentView = newView;
391390
}
392391
updateMap.clear();
@@ -549,11 +548,11 @@ void LayoutAnimationsProxy::updateIndexForMutation(
549548
if (mutation.index == -1) {
550549
return;
551550
}
552-
if (!nodeForTag_.contains(mutation.parentShadowView.tag)) {
551+
if (!nodeForTag_.contains(mutation.parentTag)) {
553552
return;
554553
}
555554

556-
auto parent = nodeForTag_[mutation.parentShadowView.tag];
555+
auto parent = nodeForTag_[mutation.parentTag];
557556

558557
int size = 0, prevIndex = -1, offset = 0;
559558

@@ -569,9 +568,9 @@ void LayoutAnimationsProxy::updateIndexForMutation(
569568
int tag = mutation.type == ShadowViewMutation::Insert
570569
? mutation.newChildShadowView.tag
571570
: mutation.oldChildShadowView.tag;
572-
LOG(INFO) << "update index for " << tag << " in "
573-
<< mutation.parentShadowView.tag << ": " << mutation.index << " -> "
574-
<< mutation.index + offset << std::endl;
571+
LOG(INFO) << "update index for " << tag << " in " << mutation.parentTag
572+
<< ": " << mutation.index << " -> " << mutation.index + offset
573+
<< std::endl;
575574
#endif
576575
mutation.index += offset;
577576
}
@@ -599,9 +598,9 @@ void LayoutAnimationsProxy::createLayoutAnimation(
599598
? mutation.oldChildShadowView
600599
: mutation.newChildShadowView);
601600
auto currentView = std::make_shared<ShadowView>(oldView);
602-
auto parentView = std::make_shared<ShadowView>(mutation.parentShadowView);
603601
layoutAnimations_.insert_or_assign(
604-
tag, LayoutAnimation{finalView, currentView, parentView, {}, count});
602+
tag,
603+
LayoutAnimation{finalView, currentView, mutation.parentTag, {}, count});
605604
}
606605

607606
void LayoutAnimationsProxy::startEnteringAnimation(
@@ -612,7 +611,6 @@ void LayoutAnimationsProxy::startEnteringAnimation(
612611
#endif
613612
auto finalView = std::make_shared<ShadowView>(mutation.newChildShadowView);
614613
auto current = std::make_shared<ShadowView>(mutation.newChildShadowView);
615-
auto parent = std::make_shared<ShadowView>(mutation.parentShadowView);
616614

617615
auto &viewProps =
618616
static_cast<const ViewProps &>(*mutation.newChildShadowView.props);
@@ -621,7 +619,6 @@ void LayoutAnimationsProxy::startEnteringAnimation(
621619
uiScheduler_->scheduleOnUI([weakThis = weak_from_this(),
622620
finalView,
623621
current,
624-
parent,
625622
mutation,
626623
opacity,
627624
tag]() {
@@ -635,7 +632,8 @@ void LayoutAnimationsProxy::startEnteringAnimation(
635632
auto &mutex = strongThis->mutex;
636633
auto lock = std::unique_lock<std::recursive_mutex>(mutex);
637634
strongThis->layoutAnimations_.insert_or_assign(
638-
tag, LayoutAnimation{finalView, current, parent, opacity});
635+
tag,
636+
LayoutAnimation{finalView, current, mutation.parentTag, opacity});
639637
window = strongThis->surfaceManager.getWindow(
640638
mutation.newChildShadowView.surfaceId);
641639
}

‎packages/react-native-reanimated/Common/cpp/reanimated/LayoutAnimations/LayoutAnimationsProxy.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ class ReanimatedModuleProxy;
2323
using namespace facebook;
2424

2525
struct LayoutAnimation {
26-
std::shared_ptr<ShadowView> finalView, currentView, parentView;
26+
std::shared_ptr<ShadowView> finalView, currentView;
27+
Tag parentTag;
2728
std::optional<double> opacity;
2829
int count = 1;
2930
LayoutAnimation &operator=(const LayoutAnimation &other) = default;

‎packages/react-native-reanimated/Common/cpp/reanimated/LayoutAnimations/LayoutAnimationsUtils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Rect SurfaceManager::getWindow(SurfaceId surfaceId) {
3131
}
3232

3333
void Node::applyMutationToIndices(ShadowViewMutation mutation) {
34-
if (tag != mutation.parentShadowView.tag) {
34+
if (tag != mutation.parentTag) {
3535
return;
3636
}
3737

‎packages/react-native-reanimated/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@
145145
"react": "18.3.1",
146146
"react-native": "0.78.0-rc.1",
147147
"react-native-builder-bob": "0.33.1",
148-
"react-native-gesture-handler": "2.22.0",
149148
"react-native-web": "0.19.11",
150149
"react-native-worklets": "workspace:*",
151150
"react-test-renderer": "18.2.0",

0 commit comments

Comments
 (0)