fix: Wrap in state

packages/nitrogen/src/views/ViewComponentShadowNode.ts

@@ -73,6 +73,7 @@ ${createFileMetadataString(`${component}.hpp`)}
 
 #include "NitroDefines.hpp"
 #include "NitroHash.hpp"
+#include <optional>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
@@ -92,7 +93,7 @@ namespace ${namespace} {
   /**
    * Props for the "${spec.name}" View.
    */
-  class ${propsClassName}: public react::ViewProps {
+  class ${propsClassName} final: public react::ViewProps {
   public:
     explicit ${propsClassName}() = default;
     ${propsClassName}(const react::PropsParserContext& context,
@@ -109,9 +110,16 @@ namespace ${namespace} {
   /**
    * State for the "${spec.name}" View.
    */
-  class ${stateClassName} {
+  class ${stateClassName} final {
   public:
     explicit ${stateClassName}() = default;
+
+  public:
+    void setProps(const ${propsClassName}& props) { _props = props; }
+    const std::optional<${propsClassName}>& getProps() const { return _props; }
+
+  private:
+    std::optional<${propsClassName}> _props;
   };
 
   /**
@@ -125,7 +133,7 @@ namespace ${namespace} {
   /**
    * The Component Descriptor for the "${spec.name}" View.
    */
-  class ${descriptorClassName}: public react::ConcreteComponentDescriptor<${shadowNodeClassName}> {
+  class ${descriptorClassName} final: public react::ConcreteComponentDescriptor<${shadowNodeClassName}> {
   public:
     ${descriptorClassName}(const react::ComponentDescriptorParameters& parameters);
 
@@ -189,8 +197,16 @@ namespace ${namespace} {
 
   void ${descriptorClassName}::adopt(react::ShadowNode& shadowNode) const {
     // This is called immediately after \`ShadowNode\` is created, cloned or in progress.
+#ifdef ANDROID
+    // On Android, we need to wrap props in our state, which gets routed through Java and later unwrapped in JNI/C++.
     auto& concreteShadowNode = static_cast<${shadowNodeClassName}&>(shadowNode);
     const ${propsClassName}& props = concreteShadowNode.getConcreteProps();
+    ${stateClassName} state;
+    state.setProps(props);
+    concreteShadowNode.setStateData(std::move(state));
+#else
+    // On iOS, prop updating happens through the updateProps: Obj-C selector.
+#endif
   }
 
 } // namespace ${namespace}

packages/nitrogen/src/views/kotlin/KotlinHybridViewManager.ts

@@ -26,7 +26,7 @@ import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
 
-class ${manager} extends SimpleViewManager<View> {
+class ${manager}: SimpleViewManager<View>() {
   override fun getName(): String {
     return "${spec.name}"
   }

packages/react-native-nitro-image/nitrogen/generated/android/kotlin/com/margelo/nitro/image/views/TestViewManager.kt

@@ -14,7 +14,7 @@ import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
 
-class TestViewManager extends SimpleViewManager<View> {
+class TestViewManager: SimpleViewManager<View>() {
   override fun getName(): String {
     return "TestView"
   }

packages/react-native-nitro-image/nitrogen/generated/shared/c++/views/TestViewComponent.cpp

@@ -45,8 +45,16 @@ namespace margelo::nitro::image::views {
 
   void HybridTestViewComponentDescriptor::adopt(react::ShadowNode& shadowNode) const {
     // This is called immediately after `ShadowNode` is created, cloned or in progress.
+#ifdef ANDROID
+    // On Android, we need to wrap props in our state, which gets routed through Java and later unwrapped in JNI/C++.
     auto& concreteShadowNode = static_cast<HybridTestViewShadowNode&>(shadowNode);
     const HybridTestViewProps& props = concreteShadowNode.getConcreteProps();
+    HybridTestViewState state;
+    state.setProps(props);
+    concreteShadowNode.setStateData(std::move(state));
+#else
+    // On iOS, prop updating happens through the updateProps: Obj-C selector.
+#endif
   }
 
 } // namespace margelo::nitro::image::views

packages/react-native-nitro-image/nitrogen/generated/shared/c++/views/TestViewComponent.hpp

@@ -11,6 +11,7 @@
 
 #include "NitroDefines.hpp"
 #include "NitroHash.hpp"
+#include <optional>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
@@ -30,7 +31,7 @@ namespace margelo::nitro::image::views {
   /**
    * Props for the "TestView" View.
    */
-  class HybridTestViewProps: public react::ViewProps {
+  class HybridTestViewProps final: public react::ViewProps {
   public:
     explicit HybridTestViewProps() = default;
     HybridTestViewProps(const react::PropsParserContext& context,
@@ -48,9 +49,16 @@ namespace margelo::nitro::image::views {
   /**
    * State for the "TestView" View.
    */
-  class HybridTestViewState {
+  class HybridTestViewState final {
   public:
     explicit HybridTestViewState() = default;
+
+  public:
+    void setProps(const HybridTestViewProps& props) { _props = props; }
+    const std::optional<HybridTestViewProps>& getProps() const { return _props; }
+
+  private:
+    std::optional<HybridTestViewProps> _props;
   };
 
   /**
@@ -64,7 +72,7 @@ namespace margelo::nitro::image::views {
   /**
    * The Component Descriptor for the "TestView" View.
    */
-  class HybridTestViewComponentDescriptor: public react::ConcreteComponentDescriptor<HybridTestViewShadowNode> {
+  class HybridTestViewComponentDescriptor final: public react::ConcreteComponentDescriptor<HybridTestViewShadowNode> {
   public:
     HybridTestViewComponentDescriptor(const react::ComponentDescriptorParameters& parameters);