Skip to content

fix: version-gate generated RawProps::at() for react-native 0.87 #1424

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

Open
cortinico wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: version-gate generated RawProps::at() for react-native 0.87 #1424

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
14 changes: 13 additions & 1 deletion packages/nitrogen/src/views/CppHybridViewComponent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ namespace ${namespace} {
`
${name}([&]() -> CachedProp<${type}> {
try {
const react::RawValue* rawValue = rawProps.at("${prop.name}", nullptr, nullptr);
const react::RawValue* rawValue = NITRO_RAWPROPS_AT(rawProps, "${prop.name}");
if (rawValue == nullptr) return sourceProps.${name};
const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
return CachedProp<${type}>::fromRawValue(*runtime, ${valueConversion}, sourceProps.${name});
Expand Down Expand Up @@ -238,6 +238,16 @@ ${createFileMetadataString(`${component}.cpp`)}
#include <react/renderer/core/ShadowNode.h>
#include <react/renderer/core/ComponentDescriptor.h>
#include <react/renderer/components/view/ViewProps.h>
#include <cxxreact/ReactNativeVersion.h>

// react-native 0.87 removed the \`at(name, prefix, suffix)\` overload of
// \`react::RawProps\` in favor of a single-argument \`at(name)\`. Keep supporting
// older versions (<= 0.86) that still require the 3-argument form.
#if REACT_NATIVE_VERSION_MAJOR > 0 || REACT_NATIVE_VERSION_MINOR > 86
#define NITRO_RAWPROPS_AT(rawProps, name) (rawProps).at(name)
#else
#define NITRO_RAWPROPS_AT(rawProps, name) (rawProps).at(name, nullptr, nullptr)
#endif

namespace ${namespace} {

Expand Down Expand Up @@ -281,6 +291,8 @@ namespace ${namespace} {
#endif

} // namespace ${namespace}

#undef NITRO_RAWPROPS_AT
`.trim()

const files: SourceFile[] = [
Expand Down
16 changes: 14 additions & 2 deletions ...tive-nitro-test/nitrogen/generated/shared/c++/views/HybridRecyclableTestViewComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,16 @@
#include <react/renderer/core/ShadowNode.h>
#include <react/renderer/core/ComponentDescriptor.h>
#include <react/renderer/components/view/ViewProps.h>
#include <cxxreact/ReactNativeVersion.h>

// react-native 0.87 removed the `at(name, prefix, suffix)` overload of
// `react::RawProps` in favor of a single-argument `at(name)`. Keep supporting
// older versions (<= 0.86) that still require the 3-argument form.
#if REACT_NATIVE_VERSION_MAJOR > 0 || REACT_NATIVE_VERSION_MINOR > 86
#define NITRO_RAWPROPS_AT(rawProps, name) (rawProps).at(name)
#else
#define NITRO_RAWPROPS_AT(rawProps, name) (rawProps).at(name, nullptr, nullptr)
#endif

namespace margelo::nitro::test::views {

Expand All @@ -28,7 +38,7 @@ namespace margelo::nitro::test::views {
react::ViewProps(context, sourceProps, rawProps, filterObjectKeys),
isBlue([&]() -> CachedProp<bool> {
try {
const react::RawValue* rawValue = rawProps.at("isBlue", nullptr, nullptr);
const react::RawValue* rawValue = NITRO_RAWPROPS_AT(rawProps, "isBlue");
if (rawValue == nullptr) return sourceProps.isBlue;
const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
return CachedProp<bool>::fromRawValue(*runtime, value, sourceProps.isBlue);
Expand All @@ -38,7 +48,7 @@ namespace margelo::nitro::test::views {
}()),
hybridRef([&]() -> CachedProp<std::optional<std::function<void(const std::shared_ptr<HybridRecyclableTestViewSpec>& /* ref */)>>> {
try {
const react::RawValue* rawValue = rawProps.at("hybridRef", nullptr, nullptr);
const react::RawValue* rawValue = NITRO_RAWPROPS_AT(rawProps, "hybridRef");
if (rawValue == nullptr) return sourceProps.hybridRef;
const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
return CachedProp<std::optional<std::function<void(const std::shared_ptr<HybridRecyclableTestViewSpec>& /* ref */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, PropNameIDCache::get(*runtime, "f")), sourceProps.hybridRef);
Expand Down Expand Up @@ -81,3 +91,5 @@ namespace margelo::nitro::test::views {
#endif

} // namespace margelo::nitro::test::views

#undef NITRO_RAWPROPS_AT
22 changes: 17 additions & 5 deletions ...s/react-native-nitro-test/nitrogen/generated/shared/c++/views/HybridTestViewComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,16 @@
#include <react/renderer/core/ShadowNode.h>
#include <react/renderer/core/ComponentDescriptor.h>
#include <react/renderer/components/view/ViewProps.h>
#include <cxxreact/ReactNativeVersion.h>

// react-native 0.87 removed the `at(name, prefix, suffix)` overload of
// `react::RawProps` in favor of a single-argument `at(name)`. Keep supporting
// older versions (<= 0.86) that still require the 3-argument form.
#if REACT_NATIVE_VERSION_MAJOR > 0 || REACT_NATIVE_VERSION_MINOR > 86
#define NITRO_RAWPROPS_AT(rawProps, name) (rawProps).at(name)
#else
#define NITRO_RAWPROPS_AT(rawProps, name) (rawProps).at(name, nullptr, nullptr)
#endif

namespace margelo::nitro::test::views {

Expand All @@ -28,7 +38,7 @@ namespace margelo::nitro::test::views {
react::ViewProps(context, sourceProps, rawProps, filterObjectKeys),
isBlue([&]() -> CachedProp<bool> {
try {
const react::RawValue* rawValue = rawProps.at("isBlue", nullptr, nullptr);
const react::RawValue* rawValue = NITRO_RAWPROPS_AT(rawProps, "isBlue");
if (rawValue == nullptr) return sourceProps.isBlue;
const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
return CachedProp<bool>::fromRawValue(*runtime, value, sourceProps.isBlue);
Expand All @@ -38,7 +48,7 @@ namespace margelo::nitro::test::views {
}()),
hasBeenCalled([&]() -> CachedProp<bool> {
try {
const react::RawValue* rawValue = rawProps.at("hasBeenCalled", nullptr, nullptr);
const react::RawValue* rawValue = NITRO_RAWPROPS_AT(rawProps, "hasBeenCalled");
if (rawValue == nullptr) return sourceProps.hasBeenCalled;
const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
return CachedProp<bool>::fromRawValue(*runtime, value, sourceProps.hasBeenCalled);
Expand All @@ -48,7 +58,7 @@ namespace margelo::nitro::test::views {
}()),
colorScheme([&]() -> CachedProp<ColorScheme> {
try {
const react::RawValue* rawValue = rawProps.at("colorScheme", nullptr, nullptr);
const react::RawValue* rawValue = NITRO_RAWPROPS_AT(rawProps, "colorScheme");
if (rawValue == nullptr) return sourceProps.colorScheme;
const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
return CachedProp<ColorScheme>::fromRawValue(*runtime, value, sourceProps.colorScheme);
Expand All @@ -58,7 +68,7 @@ namespace margelo::nitro::test::views {
}()),
someCallback([&]() -> CachedProp<std::function<void()>> {
try {
const react::RawValue* rawValue = rawProps.at("someCallback", nullptr, nullptr);
const react::RawValue* rawValue = NITRO_RAWPROPS_AT(rawProps, "someCallback");
if (rawValue == nullptr) return sourceProps.someCallback;
const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
return CachedProp<std::function<void()>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, PropNameIDCache::get(*runtime, "f")), sourceProps.someCallback);
Expand All @@ -68,7 +78,7 @@ namespace margelo::nitro::test::views {
}()),
hybridRef([&]() -> CachedProp<std::optional<std::function<void(const std::shared_ptr<HybridTestViewSpec>& /* ref */)>>> {
try {
const react::RawValue* rawValue = rawProps.at("hybridRef", nullptr, nullptr);
const react::RawValue* rawValue = NITRO_RAWPROPS_AT(rawProps, "hybridRef");
if (rawValue == nullptr) return sourceProps.hybridRef;
const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
return CachedProp<std::optional<std::function<void(const std::shared_ptr<HybridTestViewSpec>& /* ref */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, PropNameIDCache::get(*runtime, "f")), sourceProps.hybridRef);
Expand Down Expand Up @@ -114,3 +124,5 @@ namespace margelo::nitro::test::views {
#endif

} // namespace margelo::nitro::test::views

#undef NITRO_RAWPROPS_AT