react-native-readium 5.0.0-rc.16 → 5.0.0-rc.17

package/nitrogen/generated/android/NitroReadiumOnLoad.cpp

@@ -27,30 +27,40 @@
 namespace margelo::nitro::readium {
 
 int initialize(JavaVM* vm) {
+  return facebook::jni::initialize(vm, []() {
+    ::margelo::nitro::readium::registerAllNatives();
+  });
+}
+
+struct JHybridReadiumViewSpecImpl: public jni::JavaClass<JHybridReadiumViewSpecImpl, JHybridReadiumViewSpec::JavaPart> {
+  static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/reactnativereadium/HybridReadiumView;";
+  static std::shared_ptr<JHybridReadiumViewSpec> create() {
+    static auto constructorFn = javaClassStatic()->getConstructor<JHybridReadiumViewSpecImpl::javaobject()>();
+    jni::local_ref<JHybridReadiumViewSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridReadiumViewSpec();
+  }
+};
+
+void registerAllNatives() {
   using namespace margelo::nitro;
   using namespace margelo::nitro::readium;
-  using namespace facebook;
-
-  return facebook::jni::initialize(vm, [] {
-    // Register native JNI methods
-    margelo::nitro::readium::JHybridReadiumViewSpec::registerNatives();
-    margelo::nitro::readium::JFunc_void_Locator_cxx::registerNatives();
-    margelo::nitro::readium::JFunc_void_PublicationReadyEvent_cxx::registerNatives();
-    margelo::nitro::readium::JFunc_void_DecorationActivatedEvent_cxx::registerNatives();
-    margelo::nitro::readium::JFunc_void_SelectionEvent_cxx::registerNatives();
-    margelo::nitro::readium::JFunc_void_SelectionActionEvent_cxx::registerNatives();
-    margelo::nitro::readium::views::JHybridReadiumViewStateUpdater::registerNatives();
-
-    // Register Nitro Hybrid Objects
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "ReadiumView",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridReadiumViewSpec::javaobject> object("com/margelo/nitro/reactnativereadium/HybridReadiumView");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-  });
+
+  // Register native JNI methods
+  margelo::nitro::readium::JHybridReadiumViewSpec::CxxPart::registerNatives();
+  margelo::nitro::readium::JFunc_void_Locator_cxx::registerNatives();
+  margelo::nitro::readium::JFunc_void_PublicationReadyEvent_cxx::registerNatives();
+  margelo::nitro::readium::JFunc_void_DecorationActivatedEvent_cxx::registerNatives();
+  margelo::nitro::readium::JFunc_void_SelectionEvent_cxx::registerNatives();
+  margelo::nitro::readium::JFunc_void_SelectionActionEvent_cxx::registerNatives();
+  margelo::nitro::readium::views::JHybridReadiumViewStateUpdater::registerNatives();
+
+  // Register Nitro Hybrid Objects
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "ReadiumView",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridReadiumViewSpecImpl::create();
+    }
+  );
 }
 
 } // namespace margelo::nitro::readium

package/nitrogen/generated/android/NitroReadiumOnLoad.hpp

@@ -6,20 +6,29 @@
 ///
 
 #include <jni.h>
+#include <functional>
 #include <NitroModules/NitroDefines.hpp>
 
 namespace margelo::nitro::readium {
 
+  [[deprecated("Use registerNatives() instead.")]]
+  int initialize(JavaVM* vm);
+
   /**
-   * Initializes the native (C++) part of NitroReadium, and autolinks all Hybrid Objects.
-   * Call this in your `JNI_OnLoad` function (probably inside `cpp-adapter.cpp`).
+   * Register the native (C++) part of NitroReadium, and autolinks all Hybrid Objects.
+   * Call this in your `JNI_OnLoad` function (probably inside `cpp-adapter.cpp`),
+   * inside a `facebook::jni::initialize(vm, ...)` call.
    * Example:
    * ```cpp (cpp-adapter.cpp)
    * JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
-   *   return margelo::nitro::readium::initialize(vm);
+   *   return facebook::jni::initialize(vm, []() {
+   *     // register all NitroReadium HybridObjects
+   *     margelo::nitro::readium::registerNatives();
+   *     // any other custom registrations go here.
+   *   });
    * }
    * ```
    */
-  int initialize(JavaVM* vm);
+  void registerAllNatives();
 
 } // namespace margelo::nitro::readium

package/nitrogen/generated/android/c++/JHybridReadiumViewSpec.cpp

@@ -114,60 +114,54 @@ namespace margelo::nitro::readium { struct SelectionActionEvent; }
 
 namespace margelo::nitro::readium {
 
-  jni::local_ref<JHybridReadiumViewSpec::jhybriddata> JHybridReadiumViewSpec::initHybrid(jni::alias_ref<jhybridobject> jThis) {
-    return makeCxxInstance(jThis);
-  }
-
-  void JHybridReadiumViewSpec::registerNatives() {
-    registerHybrid({
-      makeNativeMethod("initHybrid", JHybridReadiumViewSpec::initHybrid),
-    });
+  std::shared_ptr<JHybridReadiumViewSpec> JHybridReadiumViewSpec::JavaPart::getJHybridReadiumViewSpec() {
+    auto hybridObject = JHybridObject::JavaPart::getJHybridObject();
+    auto castHybridObject = std::dynamic_pointer_cast<JHybridReadiumViewSpec>(hybridObject);
+    if (castHybridObject == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to downcast JHybridObject to JHybridReadiumViewSpec!");
+    }
+    return castHybridObject;
   }
 
-  size_t JHybridReadiumViewSpec::getExternalMemorySize() noexcept {
-    static const auto method = javaClassStatic()->getMethod<jlong()>("getMemorySize");
-    return method(_javaPart);
+  jni::local_ref<JHybridReadiumViewSpec::CxxPart::jhybriddata> JHybridReadiumViewSpec::CxxPart::initHybrid(jni::alias_ref<jhybridobject> jThis) {
+    return makeCxxInstance(jThis);
   }
 
-  bool JHybridReadiumViewSpec::equals(const std::shared_ptr<HybridObject>& other) {
-    if (auto otherCast = std::dynamic_pointer_cast<JHybridReadiumViewSpec>(other)) {
-      return _javaPart == otherCast->_javaPart;
+  std::shared_ptr<JHybridObject> JHybridReadiumViewSpec::CxxPart::createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) {
+    auto castJavaPart = jni::dynamic_ref_cast<JHybridReadiumViewSpec::JavaPart>(javaPart);
+    if (castJavaPart == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to cast JHybridObject::JavaPart to JHybridReadiumViewSpec::JavaPart!");
     }
-    return false;
-  }
-
-  void JHybridReadiumViewSpec::dispose() noexcept {
-    static const auto method = javaClassStatic()->getMethod<void()>("dispose");
-    method(_javaPart);
+    return std::make_shared<JHybridReadiumViewSpec>(castJavaPart);
   }
 
-  std::string JHybridReadiumViewSpec::toString() {
-    static const auto method = javaClassStatic()->getMethod<jni::JString()>("toString");
-    auto javaString = method(_javaPart);
-    return javaString->toStdString();
+  void JHybridReadiumViewSpec::CxxPart::registerNatives() {
+    registerHybrid({
+      makeNativeMethod("initHybrid", JHybridReadiumViewSpec::CxxPart::initHybrid),
+    });
   }
 
   // Properties
   std::optional<ReadiumFile> JHybridReadiumViewSpec::getFile() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JReadiumFile>()>("getFile");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JReadiumFile>()>("getFile");
     auto __result = method(_javaPart);
     return __result != nullptr ? std::make_optional(__result->toCpp()) : std::nullopt;
   }
   void JHybridReadiumViewSpec::setFile(const std::optional<ReadiumFile>& file) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JReadiumFile> /* file */)>("setFile");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JReadiumFile> /* file */)>("setFile");
     method(_javaPart, file.has_value() ? JReadiumFile::fromCpp(file.value()) : nullptr);
   }
   std::optional<Preferences> JHybridReadiumViewSpec::getPreferences() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPreferences>()>("getPreferences");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPreferences>()>("getPreferences");
     auto __result = method(_javaPart);
     return __result != nullptr ? std::make_optional(__result->toCpp()) : std::nullopt;
   }
   void JHybridReadiumViewSpec::setPreferences(const std::optional<Preferences>& preferences) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JPreferences> /* preferences */)>("setPreferences");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JPreferences> /* preferences */)>("setPreferences");
     method(_javaPart, preferences.has_value() ? JPreferences::fromCpp(preferences.value()) : nullptr);
   }
   std::optional<std::vector<DecorationGroup>> JHybridReadiumViewSpec::getDecorations() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<jni::JArrayClass<JDecorationGroup>>()>("getDecorations");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JArrayClass<JDecorationGroup>>()>("getDecorations");
     auto __result = method(_javaPart);
     return __result != nullptr ? std::make_optional([&]() {
       size_t __size = __result->size();
@@ -181,7 +175,7 @@ namespace margelo::nitro::readium {
     }()) : std::nullopt;
   }
   void JHybridReadiumViewSpec::setDecorations(const std::optional<std::vector<DecorationGroup>>& decorations) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JArrayClass<JDecorationGroup>> /* decorations */)>("setDecorations");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JArrayClass<JDecorationGroup>> /* decorations */)>("setDecorations");
     method(_javaPart, decorations.has_value() ? [&]() {
       size_t __size = decorations.value().size();
       jni::local_ref<jni::JArrayClass<JDecorationGroup>> __array = jni::JArrayClass<JDecorationGroup>::newArray(__size);
@@ -194,7 +188,7 @@ namespace margelo::nitro::readium {
     }() : nullptr);
   }
   std::optional<std::vector<SelectionAction>> JHybridReadiumViewSpec::getSelectionActions() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<jni::JArrayClass<JSelectionAction>>()>("getSelectionActions");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JArrayClass<JSelectionAction>>()>("getSelectionActions");
     auto __result = method(_javaPart);
     return __result != nullptr ? std::make_optional([&]() {
       size_t __size = __result->size();
@@ -208,7 +202,7 @@ namespace margelo::nitro::readium {
     }()) : std::nullopt;
   }
   void JHybridReadiumViewSpec::setSelectionActions(const std::optional<std::vector<SelectionAction>>& selectionActions) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JArrayClass<JSelectionAction>> /* selectionActions */)>("setSelectionActions");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JArrayClass<JSelectionAction>> /* selectionActions */)>("setSelectionActions");
     method(_javaPart, selectionActions.has_value() ? [&]() {
       size_t __size = selectionActions.value().size();
       jni::local_ref<jni::JArrayClass<JSelectionAction>> __array = jni::JArrayClass<JSelectionAction>::newArray(__size);
@@ -221,7 +215,7 @@ namespace margelo::nitro::readium {
     }() : nullptr);
   }
   std::optional<std::function<void(const Locator& /* locator */)>> JHybridReadiumViewSpec::getOnLocationChange() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_Locator::javaobject>()>("getOnLocationChange_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JFunc_void_Locator::javaobject>()>("getOnLocationChange_cxx");
     auto __result = method(_javaPart);
     return __result != nullptr ? std::make_optional([&]() -> std::function<void(const Locator& /* locator */)> {
       if (__result->isInstanceOf(JFunc_void_Locator_cxx::javaClassStatic())) [[likely]] {
@@ -234,11 +228,11 @@ namespace margelo::nitro::readium {
     }()) : std::nullopt;
   }
   void JHybridReadiumViewSpec::setOnLocationChange(const std::optional<std::function<void(const Locator& /* locator */)>>& onLocationChange) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_Locator::javaobject> /* onLocationChange */)>("setOnLocationChange_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_Locator::javaobject> /* onLocationChange */)>("setOnLocationChange_cxx");
     method(_javaPart, onLocationChange.has_value() ? JFunc_void_Locator_cxx::fromCpp(onLocationChange.value()) : nullptr);
   }
   std::optional<std::function<void(const PublicationReadyEvent& /* event */)>> JHybridReadiumViewSpec::getOnPublicationReady() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_PublicationReadyEvent::javaobject>()>("getOnPublicationReady_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JFunc_void_PublicationReadyEvent::javaobject>()>("getOnPublicationReady_cxx");
     auto __result = method(_javaPart);
     return __result != nullptr ? std::make_optional([&]() -> std::function<void(const PublicationReadyEvent& /* event */)> {
       if (__result->isInstanceOf(JFunc_void_PublicationReadyEvent_cxx::javaClassStatic())) [[likely]] {
@@ -251,11 +245,11 @@ namespace margelo::nitro::readium {
     }()) : std::nullopt;
   }
   void JHybridReadiumViewSpec::setOnPublicationReady(const std::optional<std::function<void(const PublicationReadyEvent& /* event */)>>& onPublicationReady) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_PublicationReadyEvent::javaobject> /* onPublicationReady */)>("setOnPublicationReady_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_PublicationReadyEvent::javaobject> /* onPublicationReady */)>("setOnPublicationReady_cxx");
     method(_javaPart, onPublicationReady.has_value() ? JFunc_void_PublicationReadyEvent_cxx::fromCpp(onPublicationReady.value()) : nullptr);
   }
   std::optional<std::function<void(const DecorationActivatedEvent& /* event */)>> JHybridReadiumViewSpec::getOnDecorationActivated() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_DecorationActivatedEvent::javaobject>()>("getOnDecorationActivated_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JFunc_void_DecorationActivatedEvent::javaobject>()>("getOnDecorationActivated_cxx");
     auto __result = method(_javaPart);
     return __result != nullptr ? std::make_optional([&]() -> std::function<void(const DecorationActivatedEvent& /* event */)> {
       if (__result->isInstanceOf(JFunc_void_DecorationActivatedEvent_cxx::javaClassStatic())) [[likely]] {
@@ -268,11 +262,11 @@ namespace margelo::nitro::readium {
     }()) : std::nullopt;
   }
   void JHybridReadiumViewSpec::setOnDecorationActivated(const std::optional<std::function<void(const DecorationActivatedEvent& /* event */)>>& onDecorationActivated) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_DecorationActivatedEvent::javaobject> /* onDecorationActivated */)>("setOnDecorationActivated_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_DecorationActivatedEvent::javaobject> /* onDecorationActivated */)>("setOnDecorationActivated_cxx");
     method(_javaPart, onDecorationActivated.has_value() ? JFunc_void_DecorationActivatedEvent_cxx::fromCpp(onDecorationActivated.value()) : nullptr);
   }
   std::optional<std::function<void(const SelectionEvent& /* event */)>> JHybridReadiumViewSpec::getOnSelectionChange() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_SelectionEvent::javaobject>()>("getOnSelectionChange_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JFunc_void_SelectionEvent::javaobject>()>("getOnSelectionChange_cxx");
     auto __result = method(_javaPart);
     return __result != nullptr ? std::make_optional([&]() -> std::function<void(const SelectionEvent& /* event */)> {
       if (__result->isInstanceOf(JFunc_void_SelectionEvent_cxx::javaClassStatic())) [[likely]] {
@@ -285,11 +279,11 @@ namespace margelo::nitro::readium {
     }()) : std::nullopt;
   }
   void JHybridReadiumViewSpec::setOnSelectionChange(const std::optional<std::function<void(const SelectionEvent& /* event */)>>& onSelectionChange) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_SelectionEvent::javaobject> /* onSelectionChange */)>("setOnSelectionChange_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_SelectionEvent::javaobject> /* onSelectionChange */)>("setOnSelectionChange_cxx");
     method(_javaPart, onSelectionChange.has_value() ? JFunc_void_SelectionEvent_cxx::fromCpp(onSelectionChange.value()) : nullptr);
   }
   std::optional<std::function<void(const SelectionActionEvent& /* event */)>> JHybridReadiumViewSpec::getOnSelectionAction() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_SelectionActionEvent::javaobject>()>("getOnSelectionAction_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JFunc_void_SelectionActionEvent::javaobject>()>("getOnSelectionAction_cxx");
     auto __result = method(_javaPart);
     return __result != nullptr ? std::make_optional([&]() -> std::function<void(const SelectionActionEvent& /* event */)> {
       if (__result->isInstanceOf(JFunc_void_SelectionActionEvent_cxx::javaClassStatic())) [[likely]] {
@@ -302,25 +296,25 @@ namespace margelo::nitro::readium {
     }()) : std::nullopt;
   }
   void JHybridReadiumViewSpec::setOnSelectionAction(const std::optional<std::function<void(const SelectionActionEvent& /* event */)>>& onSelectionAction) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_SelectionActionEvent::javaobject> /* onSelectionAction */)>("setOnSelectionAction_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_SelectionActionEvent::javaobject> /* onSelectionAction */)>("setOnSelectionAction_cxx");
     method(_javaPart, onSelectionAction.has_value() ? JFunc_void_SelectionActionEvent_cxx::fromCpp(onSelectionAction.value()) : nullptr);
   }
 
   // Methods
   void JHybridReadiumViewSpec::goTo(const Locator& locator) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JLocator> /* locator */)>("goTo");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JLocator> /* locator */)>("goTo");
     method(_javaPart, JLocator::fromCpp(locator));
   }
   void JHybridReadiumViewSpec::goForward() {
-    static const auto method = javaClassStatic()->getMethod<void()>("goForward");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void()>("goForward");
     method(_javaPart);
   }
   void JHybridReadiumViewSpec::goBackward() {
-    static const auto method = javaClassStatic()->getMethod<void()>("goBackward");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void()>("goBackward");
     method(_javaPart);
   }
   void JHybridReadiumViewSpec::destroy() {
-    static const auto method = javaClassStatic()->getMethod<void()>("destroy");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void()>("destroy");
     method(_javaPart);
   }
 

package/nitrogen/generated/android/c++/JHybridReadiumViewSpec.hpp

@@ -18,34 +18,33 @@ namespace margelo::nitro::readium {
 
   using namespace facebook;
 
-  class JHybridReadiumViewSpec: public jni::HybridClass<JHybridReadiumViewSpec, JHybridObject>,
-                                public virtual HybridReadiumViewSpec {
+  class JHybridReadiumViewSpec: public virtual HybridReadiumViewSpec, public virtual JHybridObject {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/reactnativereadium/HybridReadiumViewSpec;";
-    static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
-    static void registerNatives();
-
-  protected:
-    // C++ constructor (called from Java via `initHybrid()`)
-    explicit JHybridReadiumViewSpec(jni::alias_ref<jhybridobject> jThis) :
-      HybridObject(HybridReadiumViewSpec::TAG),
-      HybridBase(jThis),
-      _javaPart(jni::make_global(jThis)) {}
+    struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/reactnativereadium/HybridReadiumViewSpec;";
+      std::shared_ptr<JHybridReadiumViewSpec> getJHybridReadiumViewSpec();
+    };
+    struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/reactnativereadium/HybridReadiumViewSpec$CxxPart;";
+      static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
+      static void registerNatives();
+      using HybridBase::HybridBase;
+    protected:
+      std::shared_ptr<JHybridObject> createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) override;
+    };
 
   public:
+    explicit JHybridReadiumViewSpec(const jni::local_ref<JHybridReadiumViewSpec::JavaPart>& javaPart):
+      HybridObject(HybridReadiumViewSpec::TAG),
+      JHybridObject(javaPart),
+      _javaPart(jni::make_global(javaPart)) {}
     ~JHybridReadiumViewSpec() override {
       // Hermes GC can destroy JS objects on a non-JNI Thread.
       jni::ThreadScope::WithClassLoader([&] { _javaPart.reset(); });
     }
 
   public:
-    size_t getExternalMemorySize() noexcept override;
-    bool equals(const std::shared_ptr<HybridObject>& other) override;
-    void dispose() noexcept override;
-    std::string toString() override;
-
-  public:
-    inline const jni::global_ref<JHybridReadiumViewSpec::javaobject>& getJavaPart() const noexcept {
+    inline const jni::global_ref<JHybridReadiumViewSpec::JavaPart>& getJavaPart() const noexcept {
       return _javaPart;
     }
 
@@ -78,9 +77,7 @@ namespace margelo::nitro::readium {
     void destroy() override;
 
   private:
-    friend HybridBase;
-    using HybridBase::HybridBase;
-    jni::global_ref<JHybridReadiumViewSpec::javaobject> _javaPart;
+    jni::global_ref<JHybridReadiumViewSpec::JavaPart> _javaPart;
   };
 
 } // namespace margelo::nitro::readium

package/nitrogen/generated/android/c++/views/JHybridReadiumViewStateUpdater.cpp

@@ -16,9 +16,9 @@ using namespace facebook;
 using ConcreteStateData = react::ConcreteState<HybridReadiumViewState>;
 
 void JHybridReadiumViewStateUpdater::updateViewProps(jni::alias_ref<jni::JClass> /* class */,
-                                           jni::alias_ref<JHybridReadiumViewSpec::javaobject> javaView,
+                                           jni::alias_ref<JHybridReadiumViewSpec::JavaPart> javaView,
                                            jni::alias_ref<JStateWrapper::javaobject> stateWrapperInterface) {
-  JHybridReadiumViewSpec* view = javaView->cthis();
+  std::shared_ptr<JHybridReadiumViewSpec> hybridView = javaView->getJHybridReadiumViewSpec();
 
   // Get concrete StateWrapperImpl from passed StateWrapper interface object
   jobject rawStateWrapper = stateWrapperInterface.get();
@@ -38,39 +38,39 @@ void JHybridReadiumViewStateUpdater::updateViewProps(jni::alias_ref<jni::JClass>
 
   // Update all props if they are dirty
   if (props->file.isDirty) {
-    view->setFile(props->file.value);
+    hybridView->setFile(props->file.value);
     props->file.isDirty = false;
   }
   if (props->preferences.isDirty) {
-    view->setPreferences(props->preferences.value);
+    hybridView->setPreferences(props->preferences.value);
     props->preferences.isDirty = false;
   }
   if (props->decorations.isDirty) {
-    view->setDecorations(props->decorations.value);
+    hybridView->setDecorations(props->decorations.value);
     props->decorations.isDirty = false;
   }
   if (props->selectionActions.isDirty) {
-    view->setSelectionActions(props->selectionActions.value);
+    hybridView->setSelectionActions(props->selectionActions.value);
     props->selectionActions.isDirty = false;
   }
   if (props->onLocationChange.isDirty) {
-    view->setOnLocationChange(props->onLocationChange.value);
+    hybridView->setOnLocationChange(props->onLocationChange.value);
     props->onLocationChange.isDirty = false;
   }
   if (props->onPublicationReady.isDirty) {
-    view->setOnPublicationReady(props->onPublicationReady.value);
+    hybridView->setOnPublicationReady(props->onPublicationReady.value);
     props->onPublicationReady.isDirty = false;
   }
   if (props->onDecorationActivated.isDirty) {
-    view->setOnDecorationActivated(props->onDecorationActivated.value);
+    hybridView->setOnDecorationActivated(props->onDecorationActivated.value);
     props->onDecorationActivated.isDirty = false;
   }
   if (props->onSelectionChange.isDirty) {
-    view->setOnSelectionChange(props->onSelectionChange.value);
+    hybridView->setOnSelectionChange(props->onSelectionChange.value);
     props->onSelectionChange.isDirty = false;
   }
   if (props->onSelectionAction.isDirty) {
-    view->setOnSelectionAction(props->onSelectionAction.value);
+    hybridView->setOnSelectionAction(props->onSelectionAction.value);
     props->onSelectionAction.isDirty = false;
   }
 
@@ -79,8 +79,7 @@ void JHybridReadiumViewStateUpdater::updateViewProps(jni::alias_ref<jni::JClass>
     // hybridRef changed - call it with new this
     const auto& maybeFunc = props->hybridRef.value;
     if (maybeFunc.has_value()) {
-      std::shared_ptr<JHybridReadiumViewSpec> shared = javaView->cthis()->shared_cast<JHybridReadiumViewSpec>();
-      maybeFunc.value()(shared);
+      maybeFunc.value()(hybridView);
     }
     props->hybridRef.isDirty = false;
   }

package/nitrogen/generated/android/c++/views/JHybridReadiumViewStateUpdater.hpp

@@ -30,7 +30,7 @@ public:
 
 public:
   static void updateViewProps(jni::alias_ref<jni::JClass> /* class */,
-                              jni::alias_ref<JHybridReadiumViewSpec::javaobject> view,
+                              jni::alias_ref<JHybridReadiumViewSpec::JavaPart> view,
                               jni::alias_ref<JStateWrapper::javaobject> stateWrapperInterface);
 
 public:

package/nitrogen/generated/android/kotlin/com/margelo/nitro/reactnativereadium/HybridReadiumViewSpec.kt

@@ -10,6 +10,7 @@ package com.margelo.nitro.reactnativereadium
 import androidx.annotation.Keep
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
+import com.margelo.nitro.core.HybridObject
 import com.margelo.nitro.views.HybridView
 
 /**
@@ -24,23 +25,6 @@ import com.margelo.nitro.views.HybridView
   "LocalVariableName", "PropertyName", "PrivatePropertyName", "FunctionName"
 )
 abstract class HybridReadiumViewSpec: HybridView() {
-  @DoNotStrip
-  private var mHybridData: HybridData = initHybrid()
-
-  init {
-    super.updateNative(mHybridData)
-  }
-
-  override fun updateNative(hybridData: HybridData) {
-    mHybridData = hybridData
-    super.updateNative(hybridData)
-  }
-
-  // Default implementation of `HybridObject.toString()`
-  override fun toString(): String {
-    return "[HybridObject ReadiumView]"
-  }
-
   // Properties
   @get:DoNotStrip
   @get:Keep
@@ -153,7 +137,21 @@ abstract class HybridReadiumViewSpec: HybridView() {
   @Keep
   abstract fun destroy(): Unit
 
-  private external fun initHybrid(): HybridData
+  // Default implementation of `HybridObject.toString()`
+  override fun toString(): String {
+    return "[HybridObject ReadiumView]"
+  }
+
+  // C++ backing class
+  @DoNotStrip
+  @Keep
+  protected open class CxxPart(javaPart: HybridReadiumViewSpec): HybridObject.CxxPart(javaPart) {
+    // C++ JHybridReadiumViewSpec::CxxPart::initHybrid(...)
+    external override fun initHybrid(): HybridData
+  }
+  override fun createCxxPart(): CxxPart {
+    return CxxPart(this)
+  }
 
   companion object {
     protected const val TAG = "HybridReadiumViewSpec"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-readium",
-  "version": "5.0.0-rc.16",
+  "version": "5.0.0-rc.17",
   "description": "A react-native wrapper for https://readium.org/",
   "main": "lib/src/index",
   "types": "lib/src/index.d.ts",
@@ -86,12 +86,13 @@
     "eslint-plugin-unused-imports": "^4.3.0",
     "husky": "^6.0.0",
     "jest": "^29.6.3",
+    "nitrogen": "^0.35.0",
     "pod-install": "^0.1.0",
     "prettier": "2.8.8",
     "react": "19.0.0",
     "react-native": "0.83.1",
     "react-native-builder-bob": "^0.23.2",
-    "react-native-nitro-modules": "^0.33.2",
+    "react-native-nitro-modules": "^0.35.0",
     "release-it": "^15.0.0",
     "rimraf": "^5.0.7",
     "turbo": "^1.10.7",