address review

facebook · Jun 12, 2024 · 0094773 · 0094773
1 parent 02f60f1
commit 0094773
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/...es/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp b/...es/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp
@@ -64,9 +64,12 @@ void ScrollViewShadowNode::layout(LayoutContext layoutContext) {
 }
 
 Point ScrollViewShadowNode::getContentOriginOffset(
-    bool /*includeTransform*/) const {
-  auto stateData = getStateData();
+    bool includeTransform) const {
+    auto stateData = getStateData();
   auto contentOffset = stateData.contentOffset;
-  return {-contentOffset.x, -contentOffset.y + stateData.scrollAwayPaddingTop};
+  auto transform = includeTransform ? getTransform() : Transform::Identity();
+  auto result = transform * Vector{-contentOffset.x, -contentOffset.y, 0, 1};
+
+  return {result.x, result.y + stateData.scrollAwayPaddingTop};
 }
 } // namespace facebook::react
diff --git a/packages/react-native/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp b/packages/react-native/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp
@@ -193,7 +193,7 @@ Transform LayoutableShadowNode::getTransform() const {
 }
 
 Point LayoutableShadowNode::getContentOriginOffset(
-    bool /*includeTransform*/) const {
+    bool includeTransform) const {
   return {0, 0};
 }