fix: Use default value and register View!

mrousavy · Jan 15, 2025 · 19b6b9a · 19b6b9a
1 parent c6ba220
commit 19b6b9a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/packages/nitrogen/src/views/ViewComponentShadowNode.ts b/packages/nitrogen/src/views/ViewComponentShadowNode.ts
@@ -159,9 +159,9 @@ namespace ${namespace} {
   for (const prop of spec.properties) {
     propInitializers.push(
       `
-/* ${prop.name} */ ${escapeCppName(prop.name)}([&](){
+/* ${prop.name} */ ${escapeCppName(prop.name)}([&]() -> ${prop.type.getCode('c++')} {
   const react::RawValue* rawValue = rawProps.at("${prop.name}", nullptr, nullptr);
-  if (rawValue == nullptr) { ${prop.type.kind === 'optional' ? 'return nullptr;' : `throw std::runtime_error("${spec.name}: Prop \\"${prop.name}\\" is required and cannot be undefined!");`} }
+  if (rawValue == nullptr) { return {}; }
   const auto& [runtime, value] = (std::pair<jsi::Runtime*, const jsi::Value&>)*rawValue;
   return JSIConverter<${prop.type.getCode('c++')}>::fromJSI(*runtime, value);
 }())`.trim()

diff --git a/packages/nitrogen/src/views/swift/SwiftHybridViewManager.ts b/packages/nitrogen/src/views/swift/SwiftHybridViewManager.ts
@@ -46,7 +46,7 @@ using namespace facebook;
 
 + (void) load {
   [super load];
-  // TODO: Register it!
+  [RCTComponentViewFactory.currentComponentViewFactory registerComponentViewClass:[${component} class]];
 }
 
 + (react::ComponentDescriptorProvider) componentDescriptorProvider {

diff --git a/...ages/react-native-nitro-image/nitrogen/generated/ios/c++/views/HybridTestViewComponent.mm b/...ages/react-native-nitro-image/nitrogen/generated/ios/c++/views/HybridTestViewComponent.mm
@@ -26,7 +26,7 @@ @implementation HybridTestViewComponent
 
 + (void) load {
   [super load];
-  // TODO: Register it!
+  [RCTComponentViewFactory.currentComponentViewFactory registerComponentViewClass:[HybridTestViewComponent class]];
 }
 
 + (react::ComponentDescriptorProvider) componentDescriptorProvider {

diff --git a/.../react-native-nitro-image/nitrogen/generated/shared/c++/views/HybridTestViewComponent.cpp b/.../react-native-nitro-image/nitrogen/generated/shared/c++/views/HybridTestViewComponent.cpp
@@ -16,15 +16,15 @@ namespace margelo::nitro::image::views {
                                            const HybridTestViewProps& sourceProps,
                                            const react::RawProps& rawProps):
     react::ViewProps(context, sourceProps, rawProps, filterObjectKeys),
-    /* someProp */ someProp([&](){
+    /* someProp */ someProp([&]() -> bool {
       const react::RawValue* rawValue = rawProps.at("someProp", nullptr, nullptr);
-      if (rawValue == nullptr) { throw std::runtime_error("TestView: Prop \"someProp\" is required and cannot be undefined!"); }
+      if (rawValue == nullptr) { return {}; }
       const auto& [runtime, value] = (std::pair<jsi::Runtime*, const jsi::Value&>)*rawValue;
       return JSIConverter<bool>::fromJSI(*runtime, value);
     }()),
-    /* someCallback */ someCallback([&](){
+    /* someCallback */ someCallback([&]() -> std::function<void(double /* someParam */)> {
       const react::RawValue* rawValue = rawProps.at("someCallback", nullptr, nullptr);
-      if (rawValue == nullptr) { throw std::runtime_error("TestView: Prop \"someCallback\" is required and cannot be undefined!"); }
+      if (rawValue == nullptr) { return {}; }
       const auto& [runtime, value] = (std::pair<jsi::Runtime*, const jsi::Value&>)*rawValue;
       return JSIConverter<std::function<void(double /* someParam */)>>::fromJSI(*runtime, value);
     }()) {