From 0144798e25d5be0988a6d43e843613b420394331 Mon Sep 17 00:00:00 2001 From: Nick Lefever Date: Thu, 10 Jul 2025 12:35:18 -0700 Subject: [PATCH] Move toDynamic conversion for BoxShadow (#52536) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/52536 See title Changelog: [Internal] Reviewed By: mdvacca Differential Revision: D78005880 fbshipit-source-id: 5a4b7ff3c4d9c6ece17759926ee80aec80d3cde0 --- .../components/view/HostPlatformViewProps.cpp | 15 -------------- .../react/renderer/graphics/BoxShadow.h | 20 +++++++++++++++++++ 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp index da9d0904fff..d13bedd4fe4 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp @@ -491,21 +491,6 @@ inline static void updateAccessibilityStateProp( result["accessibilityState"] = resultState; } -static folly::dynamic toDynamic(const std::vector& boxShadow) { - folly::dynamic boxShadowResult = folly::dynamic::array(); - for (const auto& boxShadowValue : boxShadow) { - folly::dynamic boxShadowValueResult = folly::dynamic::object(); - boxShadowValueResult["offsetX"] = boxShadowValue.offsetX; - boxShadowValueResult["offsetY"] = boxShadowValue.offsetY; - boxShadowValueResult["blurRadius"] = boxShadowValue.blurRadius; - boxShadowValueResult["spreadDistance"] = boxShadowValue.spreadDistance; - boxShadowValueResult["color"] = *boxShadowValue.color; - boxShadowValueResult["inset"] = boxShadowValue.inset; - boxShadowResult.push_back(boxShadowValueResult); - } - return boxShadowResult; -} - static folly::dynamic toDynamic(const std::vector& filter) { folly::dynamic filterResult = folly::dynamic::array(); for (const auto& filterFunction : filter) { diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/BoxShadow.h b/packages/react-native/ReactCommon/react/renderer/graphics/BoxShadow.h index da49cf04578..b519487ef31 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/BoxShadow.h +++ b/packages/react-native/ReactCommon/react/renderer/graphics/BoxShadow.h @@ -21,5 +21,25 @@ struct BoxShadow { Float spreadDistance{}; SharedColor color{}; bool inset{}; + +#ifdef RN_SERIALIZABLE_STATE + folly::dynamic toDynamic() const { + folly::dynamic result = folly::dynamic::object(); + result["offsetX"] = offsetX; + result["offsetY"] = offsetY; + result["blurRadius"] = blurRadius; + result["spreadDistance"] = spreadDistance; + result["color"] = *color; + result["inset"] = inset; + return result; + } +#endif }; + +#ifdef RN_SERIALIZABLE_STATE +inline folly::dynamic toDynamic(const BoxShadow& boxShadow) { + return boxShadow.toDynamic(); +} +#endif + } // namespace facebook::react