Use the same layout mechanism as the detector in buttons

Author: j-piasecki

packages/react-native-gesture-handler/shared/shadowNodes/react/renderer/components/rngesturehandler_codegen/RNGestureHandlerButtonWrapperShadowNode.cpp

@@ -49,7 +49,6 @@ void RNGestureHandlerButtonWrapperShadowNode::appendChild(
 
 void RNGestureHandlerButtonWrapperShadowNode::layout(
     LayoutContext layoutContext) {
-  YogaLayoutableShadowNode::layout(layoutContext);
   react_native_assert(getChildren().size() == 1);
   react_native_assert(getChildren()[0]->getChildren().size() == 1);
 
@@ -58,16 +57,37 @@ void RNGestureHandlerButtonWrapperShadowNode::layout(
   auto grandChild = std::static_pointer_cast<const YogaLayoutableShadowNode>(
       child->getChildren()[0]);
 
+  auto gradChildWithProtectedAccess =
+      std::static_pointer_cast<const RNGestureHandlerButtonWrapperShadowNode>(
+          grandChild);
+
+  auto shouldSkipCustomLayout =
+      !gradChildWithProtectedAccess->yogaNode_.getHasNewLayout();
+
+  YogaLayoutableShadowNode::layout(layoutContext);
+
   child->ensureUnsealed();
   grandChild->ensureUnsealed();
 
   auto mutableChild = std::const_pointer_cast<YogaLayoutableShadowNode>(child);
   auto mutableGrandChild =
       std::const_pointer_cast<YogaLayoutableShadowNode>(grandChild);
 
-  // TODO: figure out the correct way to setup metrics between button wrapper
-  // and the child
+  // The grand child node did not have its layout changed, we can reuse previous
+  // values
+  if (shouldSkipCustomLayout) {
+    react_native_assert(previousGrandChildLayoutMetrics_.has_value());
+    mutableChild->setLayoutMetrics(previousGrandChildLayoutMetrics_.value());
+
+    auto metricsNoOrigin = previousGrandChildLayoutMetrics_.value();
+    metricsNoOrigin.frame.origin = Point{};
+    mutableGrandChild->setLayoutMetrics(metricsNoOrigin);
+    return;
+  }
+
   auto metrics = grandChild->getLayoutMetrics();
+  previousGrandChildLayoutMetrics_ = metrics;
+
   mutableChild->setLayoutMetrics(metrics);
 
   auto metricsNoOrigin = grandChild->getLayoutMetrics();

packages/react-native-gesture-handler/shared/shadowNodes/react/renderer/components/rngesturehandler_codegen/RNGestureHandlerButtonWrapperShadowNode.h

@@ -34,6 +34,12 @@ class RNGestureHandlerButtonWrapperShadowNode final
       const ShadowNode &sourceShadowNode,
       const ShadowNodeFragment &fragment)
       : ConcreteViewShadowNode(sourceShadowNode, fragment) {
+    const auto &sourceWrapperNode =
+        static_cast<const RNGestureHandlerButtonWrapperShadowNode &>(
+            sourceShadowNode);
+    previousGrandChildLayoutMetrics_ =
+        sourceWrapperNode.previousGrandChildLayoutMetrics_;
+
     initialize();
   }
 
@@ -43,6 +49,8 @@ class RNGestureHandlerButtonWrapperShadowNode final
  private:
   void initialize();
   void prepareChildren();
+
+  std::optional<LayoutMetrics> previousGrandChildLayoutMetrics_;
 };
 
 } // namespace facebook::react