Skip to content

Commit

Permalink
Merge pull request #40547 from software-mansion-labs/@kosmydel/fix-in…
Browse files Browse the repository at this point in the history
…verted-flat-list

Fix inverted flat list
  • Loading branch information
roryabraham authored Apr 19, 2024
2 parents 905eb53 + 294dd19 commit 2863f69
Showing 1 changed file with 23 additions and 0 deletions.
23 changes: 23 additions & 0 deletions patches/react-native+0.73.4+014+fix-inverted-flatlist.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
diff --git a/node_modules/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp b/node_modules/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp
index a8ecce5..6ad790e 100644
--- a/node_modules/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp
+++ b/node_modules/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp
@@ -66,7 +66,17 @@ void ScrollViewShadowNode::layout(LayoutContext layoutContext) {
Point ScrollViewShadowNode::getContentOriginOffset() const {
auto stateData = getStateData();
auto contentOffset = stateData.contentOffset;
- return {-contentOffset.x, -contentOffset.y + stateData.scrollAwayPaddingTop};
+ auto props = getConcreteProps();
+
+ float productX = 1.0f;
+ float productY = 1.0f;
+
+ for (const auto& operation : props.transform.operations) {
+ productX *= operation.x;
+ productY *= operation.y;
+ }
+
+ return {-contentOffset.x * productX, (-contentOffset.y + stateData.scrollAwayPaddingTop) * productY};
}

} // namespace facebook::react

0 comments on commit 2863f69

Please sign in to comment.