@onekeyfe/react-native-scroll-guard 3.0.81-alpha.8 → 3.0.82

package/lib/nitrogen/generated/android/c++/JHybridScrollGuardSpec.cpp

@@ -2,7 +2,7 @@
 /// JHybridScrollGuardSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridScrollGuardSpec.hpp"
@@ -16,40 +16,41 @@ namespace margelo::nitro::scrollguard { enum class ScrollGuardDirection; }
 
 namespace margelo::nitro::scrollguard {
 
-  jni::local_ref<JHybridScrollGuardSpec::jhybriddata> JHybridScrollGuardSpec::initHybrid(jni::alias_ref<jhybridobject> jThis) {
-    return makeCxxInstance(jThis);
-  }
-
-  void JHybridScrollGuardSpec::registerNatives() {
-    registerHybrid({
-      makeNativeMethod("initHybrid", JHybridScrollGuardSpec::initHybrid),
-    });
+  std::shared_ptr<JHybridScrollGuardSpec> JHybridScrollGuardSpec::JavaPart::getJHybridScrollGuardSpec() {
+    auto hybridObject = JHybridObject::JavaPart::getJHybridObject();
+    auto castHybridObject = std::dynamic_pointer_cast<JHybridScrollGuardSpec>(hybridObject);
+    if (castHybridObject == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to downcast JHybridObject to JHybridScrollGuardSpec!");
+    }
+    return castHybridObject;
   }
 
-  size_t JHybridScrollGuardSpec::getExternalMemorySize() noexcept {
-    static const auto method = javaClassStatic()->getMethod<jlong()>("getMemorySize");
-    return method(_javaPart);
+  jni::local_ref<JHybridScrollGuardSpec::CxxPart::jhybriddata> JHybridScrollGuardSpec::CxxPart::initHybrid(jni::alias_ref<jhybridobject> jThis) {
+    return makeCxxInstance(jThis);
   }
 
-  void JHybridScrollGuardSpec::dispose() noexcept {
-    static const auto method = javaClassStatic()->getMethod<void()>("dispose");
-    method(_javaPart);
+  std::shared_ptr<JHybridObject> JHybridScrollGuardSpec::CxxPart::createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) {
+    auto castJavaPart = jni::dynamic_ref_cast<JHybridScrollGuardSpec::JavaPart>(javaPart);
+    if (castJavaPart == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to cast JHybridObject::JavaPart to JHybridScrollGuardSpec::JavaPart!");
+    }
+    return std::make_shared<JHybridScrollGuardSpec>(castJavaPart);
   }
 
-  std::string JHybridScrollGuardSpec::toString() {
-    static const auto method = javaClassStatic()->getMethod<jni::JString()>("toString");
-    auto javaString = method(_javaPart);
-    return javaString->toStdString();
+  void JHybridScrollGuardSpec::CxxPart::registerNatives() {
+    registerHybrid({
+      makeNativeMethod("initHybrid", JHybridScrollGuardSpec::CxxPart::initHybrid),
+    });
   }
 
   // Properties
   std::optional<ScrollGuardDirection> JHybridScrollGuardSpec::getDirection() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JScrollGuardDirection>()>("getDirection");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JScrollGuardDirection>()>("getDirection");
     auto __result = method(_javaPart);
     return __result != nullptr ? std::make_optional(__result->toCpp()) : std::nullopt;
   }
   void JHybridScrollGuardSpec::setDirection(std::optional<ScrollGuardDirection> direction) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JScrollGuardDirection> /* direction */)>("setDirection");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JScrollGuardDirection> /* direction */)>("setDirection");
     method(_javaPart, direction.has_value() ? JScrollGuardDirection::fromCpp(direction.value()) : nullptr);
   }
 

package/lib/nitrogen/generated/android/c++/JHybridScrollGuardSpec.hpp

@@ -2,7 +2,7 @@
 /// HybridScrollGuardSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -18,33 +18,33 @@ namespace margelo::nitro::scrollguard {
 
   using namespace facebook;
 
-  class JHybridScrollGuardSpec: public jni::HybridClass<JHybridScrollGuardSpec, JHybridObject>,
-                                public virtual HybridScrollGuardSpec {
+  class JHybridScrollGuardSpec: public virtual HybridScrollGuardSpec, public virtual JHybridObject {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/scrollguard/HybridScrollGuardSpec;";
-    static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
-    static void registerNatives();
-
-  protected:
-    // C++ constructor (called from Java via `initHybrid()`)
-    explicit JHybridScrollGuardSpec(jni::alias_ref<jhybridobject> jThis) :
-      HybridObject(HybridScrollGuardSpec::TAG),
-      HybridBase(jThis),
-      _javaPart(jni::make_global(jThis)) {}
+    struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/scrollguard/HybridScrollGuardSpec;";
+      std::shared_ptr<JHybridScrollGuardSpec> getJHybridScrollGuardSpec();
+    };
+    struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/scrollguard/HybridScrollGuardSpec$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 JHybridScrollGuardSpec(const jni::local_ref<JHybridScrollGuardSpec::JavaPart>& javaPart):
+      HybridObject(HybridScrollGuardSpec::TAG),
+      JHybridObject(javaPart),
+      _javaPart(jni::make_global(javaPart)) {}
     ~JHybridScrollGuardSpec() override {
       // Hermes GC can destroy JS objects on a non-JNI Thread.
       jni::ThreadScope::WithClassLoader([&] { _javaPart.reset(); });
     }
 
   public:
-    size_t getExternalMemorySize() noexcept override;
-    void dispose() noexcept override;
-    std::string toString() override;
-
-  public:
-    inline const jni::global_ref<JHybridScrollGuardSpec::javaobject>& getJavaPart() const noexcept {
+    inline const jni::global_ref<JHybridScrollGuardSpec::JavaPart>& getJavaPart() const noexcept {
       return _javaPart;
     }
 
@@ -58,9 +58,7 @@ namespace margelo::nitro::scrollguard {
     
 
   private:
-    friend HybridBase;
-    using HybridBase::HybridBase;
-    jni::global_ref<JHybridScrollGuardSpec::javaobject> _javaPart;
+    jni::global_ref<JHybridScrollGuardSpec::JavaPart> _javaPart;
   };
 
 } // namespace margelo::nitro::scrollguard

package/lib/nitrogen/generated/android/c++/JScrollGuardDirection.hpp

@@ -2,7 +2,7 @@
 /// JScrollGuardDirection.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -19,7 +19,7 @@ namespace margelo::nitro::scrollguard {
    */
   struct JScrollGuardDirection final: public jni::JavaClass<JScrollGuardDirection> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/scrollguard/ScrollGuardDirection;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/scrollguard/ScrollGuardDirection;";
 
   public:
     /**
@@ -41,16 +41,15 @@ namespace margelo::nitro::scrollguard {
     [[maybe_unused]]
     static jni::alias_ref<JScrollGuardDirection> fromCpp(ScrollGuardDirection value) {
       static const auto clazz = javaClassStatic();
-      static const auto fieldHORIZONTAL = clazz->getStaticField<JScrollGuardDirection>("HORIZONTAL");
-      static const auto fieldVERTICAL = clazz->getStaticField<JScrollGuardDirection>("VERTICAL");
-      static const auto fieldBOTH = clazz->getStaticField<JScrollGuardDirection>("BOTH");
-      
       switch (value) {
         case ScrollGuardDirection::HORIZONTAL:
+          static const auto fieldHORIZONTAL = clazz->getStaticField<JScrollGuardDirection>("HORIZONTAL");
           return clazz->getStaticFieldValue(fieldHORIZONTAL);
         case ScrollGuardDirection::VERTICAL:
+          static const auto fieldVERTICAL = clazz->getStaticField<JScrollGuardDirection>("VERTICAL");
           return clazz->getStaticFieldValue(fieldVERTICAL);
         case ScrollGuardDirection::BOTH:
+          static const auto fieldBOTH = clazz->getStaticField<JScrollGuardDirection>("BOTH");
           return clazz->getStaticFieldValue(fieldBOTH);
         default:
           std::string stringValue = std::to_string(static_cast<int>(value));

package/lib/nitrogen/generated/android/c++/views/JHybridScrollGuardStateUpdater.cpp

@@ -2,12 +2,13 @@
 /// JHybridScrollGuardStateUpdater.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridScrollGuardStateUpdater.hpp"
 #include "views/HybridScrollGuardComponent.hpp"
 #include <NitroModules/NitroDefines.hpp>
+#include <react/fabric/StateWrapperImpl.h>
 
 namespace margelo::nitro::scrollguard::views {
 
@@ -15,41 +16,40 @@ using namespace facebook;
 using ConcreteStateData = react::ConcreteState<HybridScrollGuardState>;
 
 void JHybridScrollGuardStateUpdater::updateViewProps(jni::alias_ref<jni::JClass> /* class */,
-                                           jni::alias_ref<JHybridScrollGuardSpec::javaobject> javaView,
+                                           jni::alias_ref<JHybridScrollGuardSpec::JavaPart> javaView,
                                            jni::alias_ref<JStateWrapper::javaobject> stateWrapperInterface) {
-  JHybridScrollGuardSpec* view = javaView->cthis();
+  std::shared_ptr<JHybridScrollGuardSpec> hybridView = javaView->getJHybridScrollGuardSpec();
 
   // Get concrete StateWrapperImpl from passed StateWrapper interface object
   jobject rawStateWrapper = stateWrapperInterface.get();
-  if (!stateWrapperInterface->isInstanceOf(react::StateWrapperImpl::javaClassStatic())) {
+  if (!stateWrapperInterface->isInstanceOf(react::StateWrapperImpl::javaClassStatic())) [[unlikely]] {
       throw std::runtime_error("StateWrapper is not a StateWrapperImpl");
   }
   auto stateWrapper = jni::alias_ref<react::StateWrapperImpl::javaobject>{
             static_cast<react::StateWrapperImpl::javaobject>(rawStateWrapper)};
-
   std::shared_ptr<const react::State> state = stateWrapper->cthis()->getState();
-  auto concreteState = std::dynamic_pointer_cast<const ConcreteStateData>(state);
+  auto concreteState = std::static_pointer_cast<const ConcreteStateData>(state);
   const HybridScrollGuardState& data = concreteState->getData();
-  const std::optional<HybridScrollGuardProps>& maybeProps = data.getProps();
-  if (!maybeProps.has_value()) {
+  const std::shared_ptr<HybridScrollGuardProps>& props = data.getProps();
+  if (props == nullptr) [[unlikely]] {
     // Props aren't set yet!
     throw std::runtime_error("HybridScrollGuardState's data doesn't contain any props!");
   }
-  const HybridScrollGuardProps& props = maybeProps.value();
-  if (props.direction.isDirty) {
-    view->setDirection(props.direction.value);
-    // TODO: Set isDirty = false
+
+  // Update all props if they are dirty
+  if (props->direction.isDirty) {
+    hybridView->setDirection(props->direction.value);
+    props->direction.isDirty = false;
   }
 
   // Update hybridRef if it changed
-  if (props.hybridRef.isDirty) {
+  if (props->hybridRef.isDirty) {
     // hybridRef changed - call it with new this
-    const auto& maybeFunc = props.hybridRef.value;
+    const auto& maybeFunc = props->hybridRef.value;
     if (maybeFunc.has_value()) {
-      std::shared_ptr<JHybridScrollGuardSpec> shared = javaView->cthis()->shared_cast<JHybridScrollGuardSpec>();
-      maybeFunc.value()(shared);
+      maybeFunc.value()(hybridView);
     }
-    // TODO: Set isDirty = false
+    props->hybridRef.isDirty = false;
   }
 }
 

package/lib/nitrogen/generated/android/c++/views/JHybridScrollGuardStateUpdater.hpp

@@ -2,7 +2,7 @@
 /// JHybridScrollGuardStateUpdater.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -12,8 +12,8 @@
 #endif
 
 #include <fbjni/fbjni.h>
-#include <react/fabric/StateWrapperImpl.h>
 #include <react/fabric/CoreComponentsRegistry.h>
+#include <react/fabric/StateWrapperImpl.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 #include <NitroModules/NitroDefines.hpp>
 #include <NitroModules/JStateWrapper.hpp>
@@ -24,13 +24,13 @@ namespace margelo::nitro::scrollguard::views {
 
 using namespace facebook;
 
-class JHybridScrollGuardStateUpdater: public jni::JavaClass<JHybridScrollGuardStateUpdater> {
+class JHybridScrollGuardStateUpdater final: public jni::JavaClass<JHybridScrollGuardStateUpdater> {
 public:
   static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/scrollguard/views/HybridScrollGuardStateUpdater;";
 
 public:
   static void updateViewProps(jni::alias_ref<jni::JClass> /* class */,
-                              jni::alias_ref<JHybridScrollGuardSpec::javaobject> view,
+                              jni::alias_ref<JHybridScrollGuardSpec::JavaPart> view,
                               jni::alias_ref<JStateWrapper::javaobject> stateWrapperInterface);
 
 public:

package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/scrollguard/HybridScrollGuardSpec.kt

@@ -2,7 +2,7 @@
 /// HybridScrollGuardSpec.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.scrollguard
@@ -10,6 +10,7 @@ package com.margelo.nitro.scrollguard
 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 HybridScrollGuardSpec: 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 ScrollGuard]"
-  }
-
   // Properties
   @get:DoNotStrip
   @get:Keep
@@ -51,7 +35,21 @@ abstract class HybridScrollGuardSpec: HybridView() {
   // Methods
   
 
-  private external fun initHybrid(): HybridData
+  // Default implementation of `HybridObject.toString()`
+  override fun toString(): String {
+    return "[HybridObject ScrollGuard]"
+  }
+
+  // C++ backing class
+  @DoNotStrip
+  @Keep
+  protected open class CxxPart(javaPart: HybridScrollGuardSpec): HybridObject.CxxPart(javaPart) {
+    // C++ JHybridScrollGuardSpec::CxxPart::initHybrid(...)
+    external override fun initHybrid(): HybridData
+  }
+  override fun createCxxPart(): CxxPart {
+    return CxxPart(this)
+  }
 
   companion object {
     protected const val TAG = "HybridScrollGuardSpec"

package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/scrollguard/ScrollGuardDirection.kt

@@ -2,7 +2,7 @@
 /// ScrollGuardDirection.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.scrollguard
@@ -19,4 +19,6 @@ enum class ScrollGuardDirection(@DoNotStrip @Keep val value: Int) {
   HORIZONTAL(0),
   VERTICAL(1),
   BOTH(2);
+
+  companion object
 }

package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/scrollguard/scrollguardOnLoad.kt

@@ -2,7 +2,7 @@
 /// scrollguardOnLoad.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.scrollguard

package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/scrollguard/views/HybridScrollGuardManager.kt

@@ -2,7 +2,7 @@
 /// HybridScrollGuardManager.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.scrollguard.views
@@ -12,13 +12,20 @@ import com.facebook.react.uimanager.ReactStylesDiffMap
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
+import com.margelo.nitro.R.id.associated_hybrid_view_tag
+import com.margelo.nitro.views.RecyclableView
 import com.margelo.nitro.scrollguard.*
 
 /**
  * Represents the React Native `ViewManager` for the "ScrollGuard" Nitro HybridView.
  */
-open class HybridScrollGuardManager: SimpleViewManager<View>() {
-  private val views = hashMapOf<View, HybridScrollGuard>()
+public class HybridScrollGuardManager: SimpleViewManager<View>() {
+  init {
+    if (RecyclableView::class.java.isAssignableFrom(HybridScrollGuard::class.java)) {
+      // Enable view recycling
+      super.setupViewRecycling()
+    }
+  }
 
   override fun getName(): String {
     return "ScrollGuard"
@@ -27,17 +34,13 @@ open class HybridScrollGuardManager: SimpleViewManager<View>() {
   override fun createViewInstance(reactContext: ThemedReactContext): View {
     val hybridView = HybridScrollGuard(reactContext)
     val view = hybridView.view
-    views[view] = hybridView
+    view.setTag(associated_hybrid_view_tag, hybridView)
     return view
   }
 
-  override fun onDropViewInstance(view: View) {
-    super.onDropViewInstance(view)
-    views.remove(view)
-  }
-
   override fun updateState(view: View, props: ReactStylesDiffMap, stateWrapper: StateWrapper): Any? {
-    val hybridView = views[view] ?: throw Error("Couldn't find view $view in local views table!")
+    val hybridView = getHybridView(view)
+      ?: throw Error("Couldn't find view $view in local views table!")
 
     // 1. Update each prop individually
     hybridView.beforeUpdate()
@@ -47,4 +50,31 @@ open class HybridScrollGuardManager: SimpleViewManager<View>() {
     // 2. Continue in base View props
     return super.updateState(view, props, stateWrapper)
   }
+
+  override fun onDropViewInstance(view: View) {
+    val hybridView = getHybridView(view)
+    hybridView?.onDropView()
+    return super.onDropViewInstance(view)
+  }
+
+  protected override fun prepareToRecycleView(reactContext: ThemedReactContext, view: View): View? {
+    super.prepareToRecycleView(reactContext, view)
+    val hybridView = getHybridView(view)
+      ?: return null
+
+    @Suppress("USELESS_IS_CHECK")
+    if (hybridView is RecyclableView) {
+      // Recycle in it's implementation
+      hybridView.prepareForRecycle()
+
+      // Maybe update the view if it changed
+      return hybridView.view
+    } else {
+      return null
+    }
+  }
+
+  private fun getHybridView(view: View): HybridScrollGuard? {
+    return view.getTag(associated_hybrid_view_tag) as? HybridScrollGuard
+  }
 }

package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/scrollguard/views/HybridScrollGuardStateUpdater.kt

@@ -2,7 +2,7 @@
 /// HybridScrollGuardStateUpdater.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.scrollguard.views

package/lib/nitrogen/generated/android/scrollguard+autolinking.cmake

@@ -2,7 +2,7 @@
 # scrollguard+autolinking.cmake
 # This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 # https://github.com/mrousavy/nitro
-# Copyright © 2026 Marc Rousavy @ Margelo
+# Copyright © Marc Rousavy @ Margelo
 #
 
 # This is a CMake file that adds all files generated by Nitrogen

package/lib/nitrogen/generated/android/scrollguard+autolinking.gradle

@@ -2,7 +2,7 @@
 /// scrollguard+autolinking.gradle
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 /// This is a Gradle file that adds all files generated by Nitrogen

package/lib/nitrogen/generated/android/scrollguardOnLoad.cpp

@@ -2,7 +2,7 @@
 /// scrollguardOnLoad.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #ifndef BUILDING_SCROLLGUARD_WITH_GENERATED_CMAKE_PROJECT
@@ -22,25 +22,35 @@
 namespace margelo::nitro::scrollguard {
 
 int initialize(JavaVM* vm) {
+  return facebook::jni::initialize(vm, []() {
+    ::margelo::nitro::scrollguard::registerAllNatives();
+  });
+}
+
+struct JHybridScrollGuardSpecImpl: public jni::JavaClass<JHybridScrollGuardSpecImpl, JHybridScrollGuardSpec::JavaPart> {
+  static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/scrollguard/HybridScrollGuard;";
+  static std::shared_ptr<JHybridScrollGuardSpec> create() {
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridScrollGuardSpecImpl::javaobject()>();
+    jni::local_ref<JHybridScrollGuardSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridScrollGuardSpec();
+  }
+};
+
+void registerAllNatives() {
   using namespace margelo::nitro;
   using namespace margelo::nitro::scrollguard;
-  using namespace facebook;
-
-  return facebook::jni::initialize(vm, [] {
-    // Register native JNI methods
-    margelo::nitro::scrollguard::JHybridScrollGuardSpec::registerNatives();
-    margelo::nitro::scrollguard::views::JHybridScrollGuardStateUpdater::registerNatives();
-
-    // Register Nitro Hybrid Objects
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "ScrollGuard",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridScrollGuardSpec::javaobject> object("com/margelo/nitro/scrollguard/HybridScrollGuard");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-  });
+
+  // Register native JNI methods
+  margelo::nitro::scrollguard::JHybridScrollGuardSpec::CxxPart::registerNatives();
+  margelo::nitro::scrollguard::views::JHybridScrollGuardStateUpdater::registerNatives();
+
+  // Register Nitro Hybrid Objects
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "ScrollGuard",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridScrollGuardSpecImpl::create();
+    }
+  );
 }
 
 } // namespace margelo::nitro::scrollguard

package/lib/nitrogen/generated/android/scrollguardOnLoad.hpp

@@ -2,24 +2,33 @@
 /// scrollguardOnLoad.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include <jni.h>
+#include <functional>
 #include <NitroModules/NitroDefines.hpp>
 
 namespace margelo::nitro::scrollguard {
 
+  [[deprecated("Use registerNatives() instead.")]]
+  int initialize(JavaVM* vm);
+
   /**
-   * Initializes the native (C++) part of scrollguard, and autolinks all Hybrid Objects.
-   * Call this in your `JNI_OnLoad` function (probably inside `cpp-adapter.cpp`).
+   * Register the native (C++) part of scrollguard, 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::scrollguard::initialize(vm);
+   *   return facebook::jni::initialize(vm, []() {
+   *     // register all scrollguard HybridObjects
+   *     margelo::nitro::scrollguard::registerNatives();
+   *     // any other custom registrations go here.
+   *   });
    * }
    * ```
    */
-  int initialize(JavaVM* vm);
+  void registerAllNatives();
 
 } // namespace margelo::nitro::scrollguard

package/lib/nitrogen/generated/ios/ScrollGuard+autolinking.rb

@@ -2,7 +2,7 @@
 # ScrollGuard+autolinking.rb
 # This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 # https://github.com/mrousavy/nitro
-# Copyright © 2026 Marc Rousavy @ Margelo
+# Copyright © Marc Rousavy @ Margelo
 #
 
 # This is a Ruby script that adds all files generated by Nitrogen
@@ -52,7 +52,7 @@ def add_nitrogen_files(spec)
   spec.pod_target_xcconfig = current_pod_target_xcconfig.merge({
     # Use C++ 20
     "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
-    # Enables C++ <-> Swift interop (by default it's only C)
+    # Enables C++ <-> Swift interop (by default it's only ObjC)
     "SWIFT_OBJC_INTEROP_MODE" => "objcxx",
     # Enables stricter modular headers
     "DEFINES_MODULE" => "YES",

package/lib/nitrogen/generated/ios/ScrollGuard-Swift-Cxx-Bridge.cpp

@@ -2,7 +2,7 @@
 /// ScrollGuard-Swift-Cxx-Bridge.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "ScrollGuard-Swift-Cxx-Bridge.hpp"

package/lib/nitrogen/generated/ios/ScrollGuard-Swift-Cxx-Bridge.hpp

@@ -2,7 +2,7 @@
 /// ScrollGuard-Swift-Cxx-Bridge.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -41,7 +41,7 @@ namespace margelo::nitro::scrollguard::bridge::swift {
     return optional.has_value();
   }
   inline ScrollGuardDirection get_std__optional_ScrollGuardDirection_(const std::optional<ScrollGuardDirection>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::shared_ptr<HybridScrollGuardSpec>

package/lib/nitrogen/generated/ios/ScrollGuard-Swift-Cxx-Umbrella.hpp

@@ -2,7 +2,7 @@
 /// ScrollGuard-Swift-Cxx-Umbrella.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once