Make getContentOriginOffset to know info about if call-site want tran…

…sform or not (facebook#44822)

Summary:
Pull Request resolved: facebook#44822

Changelog: [Internal]

This is to make `getContentOriginOffset` to have `includeTransform` information passed during Layout computation.

Differential Revision: D58223380

packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp

@@ -63,9 +63,11 @@ void ScrollViewShadowNode::layout(LayoutContext layoutContext) {
   updateStateIfNeeded();
 }
 
-Point ScrollViewShadowNode::getContentOriginOffset() const {
+Point ScrollViewShadowNode::getContentOriginOffset(
+    bool includeTransform) const {
   auto stateData = getStateData();
   auto contentOffset = stateData.contentOffset;
+
   return {-contentOffset.x, -contentOffset.y + stateData.scrollAwayPaddingTop};
 }
 

packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.h

@@ -37,7 +37,7 @@ class ScrollViewShadowNode final : public ConcreteViewShadowNode<
 #pragma mark - LayoutableShadowNode
 
   void layout(LayoutContext layoutContext) override;
-  Point getContentOriginOffset() const override;
+  Point getContentOriginOffset(bool includeTransform) const override;
 
  private:
   void updateStateIfNeeded();

packages/react-native/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp

@@ -151,7 +151,11 @@ LayoutMetrics LayoutableShadowNode::computeRelativeLayoutMetrics(
     }
 
     if (i != 0 && policy.includeTransform) {
-      resultFrame.origin += currentShadowNode->getContentOriginOffset();
+      // Transformation is not applied here and instead we delegated out in
+      // getContentOriginOffset. The reason is that for `ScrollViewShadowNode`,
+      // we need to consider `scrollAwayPaddingTop` which should NOT be included
+      // in the transform.
+      resultFrame.origin += currentShadowNode->getContentOriginOffset(true);
     }
 
     if (policy.enableOverflowClipping) {
@@ -189,6 +193,11 @@ Transform LayoutableShadowNode::getTransform() const {
 }
 
 Point LayoutableShadowNode::getContentOriginOffset() const {
+  return getContentOriginOffset(false);
+}
+
+Point LayoutableShadowNode::getContentOriginOffset(
+    bool includeTransform) const {
   return {0, 0};
 }
 

packages/react-native/ReactCommon/react/renderer/core/LayoutableShadowNode.h

@@ -122,9 +122,21 @@ class LayoutableShadowNode : public ShadowNode {
    * Returns offset which is applied to children's origin in
    * `LayoutableShadowNode::getRelativeLayoutMetrics` and
    * `LayoutableShadowNode::findNodeAtPoint`.
+   * This is a shim implementation to call `getContentOriginOffset` with
+   * includeTransform `false` for backward compatability.
    */
   virtual Point getContentOriginOffset() const;
 
+  /*
+   * Returns offset which is applied to children's origin in
+   * `LayoutableShadowNode::getRelativeLayoutMetrics` and
+   * `LayoutableShadowNode::findNodeAtPoint`.
+   * i`ncludeTransform` is a flag to include the transform in the offset. This
+   * is a rare case but needed for case where transform is involved for e.g. in
+   * ScrollView.
+   */
+  virtual Point getContentOriginOffset(bool includeTransform) const;
+
   /*
    * Sets layout metrics for the shadow node.
    */

packages/react-native/ReactCommon/react/renderer/core/tests/TestComponent.h

@@ -76,7 +76,8 @@ class TestShadowNode final : public ConcreteViewShadowNode<
 
   facebook::react::Point _contentOriginOffset{};
 
-  facebook::react::Point getContentOriginOffset() const override {
+  facebook::react::Point getContentOriginOffset(
+      bool includeTransform) const override {
     return _contentOriginOffset;
   }
 };