From 90c6f7eab887a9e589ea520020f93ed91f538cfa Mon Sep 17 00:00:00 2001 From: Pieter De Baets Date: Wed, 29 Jan 2025 05:05:04 -0800 Subject: [PATCH] Fix ScrollEvent DebugStringCovertible (#49029) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/49029 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] Reviewed By: sammy-SC Differential Revision: D68797482 fbshipit-source-id: 6a01192c799903b6f956f9b0acea94bd93183f3b --- .../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 3c0f8b94add..9ade5490283 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 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 cb55148cf5d..a17fd91c3ed 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 #include +#include #include #include diff --git a/packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertible.h b/packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertible.h index 63b27aa6f3c..10843c87d87 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 #include -#include "flags.h" +#include namespace facebook::react {