Skip to content

Move nativeId parsing into the Props ctor initializer list #57339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
javache wants to merge 1 commit into from
+15 −41
Closed

Move nativeId parsing into the Props ctor initializer list #57339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions packages/react-native/ReactCommon/react/renderer/components/view/YogaStylableProps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,11 @@ YogaStylableProps::YogaStylableProps(
const YogaStylableProps& sourceProps,
const RawProps& rawProps,
const std::function<bool(const std::string&)>& 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);
}
Expand Down
23 changes: 10 additions & 13 deletions packages/react-native/ReactCommon/react/renderer/core/Props.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,20 @@
namespace facebook::react {

Props::Props(
const PropsParserContext& context,
const Props& sourceProps,
const RawProps& rawProps,
const std::function<bool(const std::string&)>& filterObjectKeys) {
initialize(context, sourceProps, rawProps, filterObjectKeys);
}

void Props::initialize(
const PropsParserContext& context,
const Props& sourceProps,
const RawProps& rawProps,
[[maybe_unused]] const std::function<bool(const std::string&)>&
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);
Expand Down
12 changes: 0 additions & 12 deletions packages/react-native/ReactCommon/react/renderer/core/Props.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<bool(const std::string &)> &filterObjectKeys = nullptr);
};

} // namespace facebook::react
1 change: 0 additions & 1 deletion scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<bool(const std::string&)>& 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<bool(const std::string&)>& filterObjectKeys = nullptr);
Expand Down
1 change: 0 additions & 1 deletion scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<bool(const std::string&)>& 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<bool(const std::string&)>& filterObjectKeys = nullptr);
Expand Down
1 change: 0 additions & 1 deletion scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<bool(const std::string&)>& 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<bool(const std::string&)>& filterObjectKeys = nullptr);
Expand Down
1 change: 0 additions & 1 deletion scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<bool(const std::string&)>& 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<bool(const std::string&)>& filterObjectKeys = nullptr);
Expand Down
1 change: 0 additions & 1 deletion scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<bool(const std::string&)>& 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<bool(const std::string&)>& filterObjectKeys = nullptr);
Expand Down
1 change: 0 additions & 1 deletion scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<bool(const std::string&)>& 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<bool(const std::string&)>& filterObjectKeys = nullptr);
Expand Down
1 change: 0 additions & 1 deletion scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<bool(const std::string&)>& 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<bool(const std::string&)>& filterObjectKeys = nullptr);
Expand Down
1 change: 0 additions & 1 deletion scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<bool(const std::string&)>& 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<bool(const std::string&)>& filterObjectKeys = nullptr);
Expand Down
1 change: 0 additions & 1 deletion scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<bool(const std::string&)>& 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<bool(const std::string&)>& filterObjectKeys = nullptr);
Expand Down
Loading