From ef466064833572f940f6397e845d78b4168ec8a6 Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@meta.com>
Date: Wed, 29 Jan 2025 01:16:57 -0800
Subject: [PATCH] Fix ScrollEvent DebugStringCovertible

Summary:
This was never being compiled, because we didn't import the header that set `RN_DEBUG_STRING_CONVERTIBLE`

Will look at enabling `-Wundef` to catch these.

Changelog: [Internal]

Differential Revision: D68797482
---
 .../react/renderer/components/scrollview/ScrollEvent.cpp        | 2 +-
 .../react/renderer/components/scrollview/ScrollEvent.h          | 1 +
 .../ReactCommon/react/renderer/debug/DebugStringConvertible.h   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollEvent.cpp b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollEvent.cpp
index 3c0f8b94adde..9ade54902836 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollEvent.cpp
+++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollEvent.cpp
@@ -124,7 +124,7 @@ std::vector<DebugStringConvertibleObject> getDebugProps(
       {"contentInset", getDebugDescription(scrollEvent.contentInset, options)},
       {"contentSize", getDebugDescription(scrollEvent.contentSize, options)},
       {"layoutMeasurement",
-       getDebugDescription(scrollEvent.layoutMeasurement, options)},
+       getDebugDescription(scrollEvent.containerSize, options)},
       {"zoomScale", getDebugDescription(scrollEvent.zoomScale, options)},
       {"timestamp", getDebugDescription(scrollEvent.timestamp, options)}};
 }
diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollEvent.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollEvent.h
index cb55148cf5d8..a17fd91c3edd 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollEvent.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollEvent.h
@@ -9,6 +9,7 @@
 
 #include <folly/dynamic.h>
 #include <react/renderer/core/EventPayload.h>
+#include <react/renderer/debug/DebugStringConvertible.h>
 #include <react/renderer/graphics/RectangleEdges.h>
 #include <react/renderer/graphics/Size.h>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertible.h b/packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertible.h
index 63b27aa6f3c8..10843c87d870 100644
--- a/packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertible.h
+++ b/packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertible.h
@@ -14,7 +14,7 @@
 #include <unordered_set>
 #include <vector>
 
-#include "flags.h"
+#include <react/renderer/debug/flags.h>
 
 namespace facebook::react {