diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/YogaStylableProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/YogaStylableProps.cpp index ae2da15fc0a..d740d4a153b 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/YogaStylableProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/YogaStylableProps.cpp @@ -24,13 +24,11 @@ YogaStylableProps::YogaStylableProps( const YogaStylableProps& sourceProps, const RawProps& rawProps, const std::function& filterObjectKeys) - : Props() { - initialize(context, sourceProps, rawProps, filterObjectKeys); - - yogaStyle = ReactNativeFeatureFlags::enableCppPropsIteratorSetter() - ? sourceProps.yogaStyle - : convertRawProp(context, rawProps, sourceProps.yogaStyle); - + : Props(context, sourceProps, rawProps, filterObjectKeys), + yogaStyle( + ReactNativeFeatureFlags::enableCppPropsIteratorSetter() + ? sourceProps.yogaStyle + : convertRawProp(context, rawProps, sourceProps.yogaStyle)) { if (!ReactNativeFeatureFlags::enableCppPropsIteratorSetter()) { convertRawPropAliases(context, sourceProps, rawProps); } diff --git a/packages/react-native/ReactCommon/react/renderer/core/Props.cpp b/packages/react-native/ReactCommon/react/renderer/core/Props.cpp index f5553a117c6..aca087d296e 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/Props.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/Props.cpp @@ -16,23 +16,20 @@ namespace facebook::react { Props::Props( - const PropsParserContext& context, - const Props& sourceProps, - const RawProps& rawProps, - const std::function& filterObjectKeys) { - initialize(context, sourceProps, rawProps, filterObjectKeys); -} - -void Props::initialize( const PropsParserContext& context, const Props& sourceProps, const RawProps& rawProps, [[maybe_unused]] const std::function& - filterObjectKeys) { - nativeId = ReactNativeFeatureFlags::enableCppPropsIteratorSetter() - ? sourceProps.nativeId - : convertRawProp(context, rawProps, "nativeID", sourceProps.nativeId, {}); - + filterObjectKeys) + : nativeId( + ReactNativeFeatureFlags::enableCppPropsIteratorSetter() + ? sourceProps.nativeId + : convertRawProp( + context, + rawProps, + "nativeID", + sourceProps.nativeId, + {})) { #ifdef RN_SERIALIZABLE_STATE if (!ReactNativeFeatureFlags::enableExclusivePropsUpdateAndroid()) { initializeDynamicProps(sourceProps, rawProps, filterObjectKeys); diff --git a/packages/react-native/ReactCommon/react/renderer/core/Props.h b/packages/react-native/ReactCommon/react/renderer/core/Props.h index 2dadef6b6e6..ad3e264d31e 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/Props.h +++ b/packages/react-native/ReactCommon/react/renderer/core/Props.h @@ -82,18 +82,6 @@ class Props : public virtual Sealable, public virtual DebugStringConvertible { SharedDebugStringConvertibleList getDebugProps() const override; #endif - - protected: - /** Initialize member variables of Props instance */ - void initialize( - const PropsParserContext &context, - const Props &sourceProps, - const RawProps &rawProps, - /** - * Filter object keys to be excluded when converting the RawProps to - * folly::dynamic (android only) - */ - const std::function &filterObjectKeys = nullptr); }; } // namespace facebook::react diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api index 205202f898f..4a5ea93ebca 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api @@ -4125,7 +4125,6 @@ class facebook::react::PreparedTextCacheKey { } class facebook::react::Props : public virtual facebook::react::Sealable, public virtual facebook::react::DebugStringConvertible { - protected void initialize(const facebook::react::PropsParserContext& context, const facebook::react::Props& sourceProps, const facebook::react::RawProps& rawProps, const std::function& filterObjectKeys = nullptr); public Props() = default; public Props(const facebook::react::Props& other) = delete; public Props(const facebook::react::PropsParserContext& context, const facebook::react::Props& sourceProps, const facebook::react::RawProps& rawProps, const std::function& filterObjectKeys = nullptr); diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api index 59443fbd585..6e821b751f6 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api @@ -3979,7 +3979,6 @@ class facebook::react::PreparedTextCacheKey { } class facebook::react::Props : public virtual facebook::react::Sealable, public virtual facebook::react::DebugStringConvertible { - protected void initialize(const facebook::react::PropsParserContext& context, const facebook::react::Props& sourceProps, const facebook::react::RawProps& rawProps, const std::function& filterObjectKeys = nullptr); public Props() = default; public Props(const facebook::react::Props& other) = delete; public Props(const facebook::react::PropsParserContext& context, const facebook::react::Props& sourceProps, const facebook::react::RawProps& rawProps, const std::function& filterObjectKeys = nullptr); diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api index 0f5f39b20ab..77a90677d4c 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api @@ -4122,7 +4122,6 @@ class facebook::react::PreparedTextCacheKey { } class facebook::react::Props : public virtual facebook::react::Sealable, public virtual facebook::react::DebugStringConvertible { - protected void initialize(const facebook::react::PropsParserContext& context, const facebook::react::Props& sourceProps, const facebook::react::RawProps& rawProps, const std::function& filterObjectKeys = nullptr); public Props() = default; public Props(const facebook::react::Props& other) = delete; public Props(const facebook::react::PropsParserContext& context, const facebook::react::Props& sourceProps, const facebook::react::RawProps& rawProps, const std::function& filterObjectKeys = nullptr); diff --git a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api index cc3c6c0e38d..cb3c73c37a1 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api @@ -6312,7 +6312,6 @@ class facebook::react::PreparedTextCacheKey { } class facebook::react::Props : public virtual facebook::react::Sealable, public virtual facebook::react::DebugStringConvertible { - protected void initialize(const facebook::react::PropsParserContext& context, const facebook::react::Props& sourceProps, const facebook::react::RawProps& rawProps, const std::function& filterObjectKeys = nullptr); public Props() = default; public Props(const facebook::react::Props& other) = delete; public Props(const facebook::react::PropsParserContext& context, const facebook::react::Props& sourceProps, const facebook::react::RawProps& rawProps, const std::function& filterObjectKeys = nullptr); diff --git a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api index bcd1ef1969f..87d6ca7aa0d 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api @@ -6194,7 +6194,6 @@ class facebook::react::PreparedTextCacheKey { } class facebook::react::Props : public virtual facebook::react::Sealable, public virtual facebook::react::DebugStringConvertible { - protected void initialize(const facebook::react::PropsParserContext& context, const facebook::react::Props& sourceProps, const facebook::react::RawProps& rawProps, const std::function& filterObjectKeys = nullptr); public Props() = default; public Props(const facebook::react::Props& other) = delete; public Props(const facebook::react::PropsParserContext& context, const facebook::react::Props& sourceProps, const facebook::react::RawProps& rawProps, const std::function& filterObjectKeys = nullptr); diff --git a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api index baa00077d2b..cff79303f84 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api @@ -6309,7 +6309,6 @@ class facebook::react::PreparedTextCacheKey { } class facebook::react::Props : public virtual facebook::react::Sealable, public virtual facebook::react::DebugStringConvertible { - protected void initialize(const facebook::react::PropsParserContext& context, const facebook::react::Props& sourceProps, const facebook::react::RawProps& rawProps, const std::function& filterObjectKeys = nullptr); public Props() = default; public Props(const facebook::react::Props& other) = delete; public Props(const facebook::react::PropsParserContext& context, const facebook::react::Props& sourceProps, const facebook::react::RawProps& rawProps, const std::function& filterObjectKeys = nullptr); diff --git a/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api index 575079ae0c3..87aaa9ae289 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api @@ -2730,7 +2730,6 @@ class facebook::react::PreparedTextCacheKey { } class facebook::react::Props : public virtual facebook::react::Sealable, public virtual facebook::react::DebugStringConvertible { - protected void initialize(const facebook::react::PropsParserContext& context, const facebook::react::Props& sourceProps, const facebook::react::RawProps& rawProps, const std::function& filterObjectKeys = nullptr); public Props() = default; public Props(const facebook::react::Props& other) = delete; public Props(const facebook::react::PropsParserContext& context, const facebook::react::Props& sourceProps, const facebook::react::RawProps& rawProps, const std::function& filterObjectKeys = nullptr); diff --git a/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api index 81906b49e19..ed97d3fdcb8 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api @@ -2624,7 +2624,6 @@ class facebook::react::PreparedTextCacheKey { } class facebook::react::Props : public virtual facebook::react::Sealable, public virtual facebook::react::DebugStringConvertible { - protected void initialize(const facebook::react::PropsParserContext& context, const facebook::react::Props& sourceProps, const facebook::react::RawProps& rawProps, const std::function& filterObjectKeys = nullptr); public Props() = default; public Props(const facebook::react::Props& other) = delete; public Props(const facebook::react::PropsParserContext& context, const facebook::react::Props& sourceProps, const facebook::react::RawProps& rawProps, const std::function& filterObjectKeys = nullptr); diff --git a/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api index ccc6128c0ef..9a6ba873336 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api @@ -2727,7 +2727,6 @@ class facebook::react::PreparedTextCacheKey { } class facebook::react::Props : public virtual facebook::react::Sealable, public virtual facebook::react::DebugStringConvertible { - protected void initialize(const facebook::react::PropsParserContext& context, const facebook::react::Props& sourceProps, const facebook::react::RawProps& rawProps, const std::function& filterObjectKeys = nullptr); public Props() = default; public Props(const facebook::react::Props& other) = delete; public Props(const facebook::react::PropsParserContext& context, const facebook::react::Props& sourceProps, const facebook::react::RawProps& rawProps, const std::function& filterObjectKeys = nullptr);