@onekeyfe/react-native-scroll-guard 3.0.81 → 3.0.85

package/lib/nitrogen/generated/ios/ScrollGuardAutolinking.mm

@@ -2,7 +2,7 @@
 /// ScrollGuardAutolinking.mm
 /// 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
 ///
 
 #import <Foundation/Foundation.h>

package/lib/nitrogen/generated/ios/ScrollGuardAutolinking.swift

@@ -2,19 +2,16 @@
 /// ScrollGuardAutolinking.swift
 /// 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
 ///
 
+import NitroModules
+
+// TODO: Use empty enums once Swift supports exporting them as namespaces
+//       See: https://github.com/swiftlang/swift/pull/83616
 public final class ScrollGuardAutolinking {
   public typealias bridge = margelo.nitro.scrollguard.bridge.swift
 
-  /**
-   * Creates an instance of a Swift class that implements `HybridScrollGuardSpec`,
-   * and wraps it in a Swift class that can directly interop with C++ (`HybridScrollGuardSpec_cxx`)
-   *
-   * This is generated by Nitrogen and will initialize the class specified
-   * in the `"autolinking"` property of `nitro.json` (in this case, `HybridScrollGuard`).
-   */
   public static func createScrollGuard() -> bridge.std__shared_ptr_HybridScrollGuardSpec_ {
     let hybridObject = HybridScrollGuard()
     return { () -> bridge.std__shared_ptr_HybridScrollGuardSpec_ in
@@ -22,4 +19,8 @@ public final class ScrollGuardAutolinking {
       return __cxxWrapped.getCxxPart()
     }()
   }
+  
+  public static func isScrollGuardRecyclable() -> Bool {
+    return HybridScrollGuard.self is any RecyclableView.Type
+  }
 }

package/lib/nitrogen/generated/ios/c++/HybridScrollGuardSpecSwift.cpp

@@ -2,7 +2,7 @@
 /// HybridScrollGuardSpecSwift.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 "HybridScrollGuardSpecSwift.hpp"

package/lib/nitrogen/generated/ios/c++/HybridScrollGuardSpecSwift.hpp

@@ -2,7 +2,7 @@
 /// HybridScrollGuardSpecSwift.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
@@ -49,6 +49,12 @@ namespace margelo::nitro::scrollguard {
     inline size_t getExternalMemorySize() noexcept override {
       return _swiftPart.getMemorySize();
     }
+    bool equals(const std::shared_ptr<HybridObject>& other) override {
+      if (auto otherCast = std::dynamic_pointer_cast<HybridScrollGuardSpecSwift>(other)) {
+        return _swiftPart.equals(otherCast->_swiftPart);
+      }
+      return false;
+    }
     void dispose() noexcept override {
       _swiftPart.dispose();
     }

package/lib/nitrogen/generated/ios/c++/views/HybridScrollGuardComponent.mm

@@ -2,7 +2,7 @@
 /// HybridScrollGuardComponent.mm
 /// 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
 ///
 
 #import "HybridScrollGuardComponent.hpp"
@@ -17,6 +17,13 @@
 #import "HybridScrollGuardSpecSwift.hpp"
 #import "ScrollGuard-Swift-Cxx-Umbrella.hpp"
 
+#if __has_include(<cxxreact/ReactNativeVersion.h>)
+#include <cxxreact/ReactNativeVersion.h>
+#if REACT_NATIVE_VERSION_MINOR >= 82
+#define ENABLE_RCT_COMPONENT_VIEW_INVALIDATE
+#endif
+#endif
+
 using namespace facebook;
 using namespace margelo::nitro::scrollguard;
 using namespace margelo::nitro::scrollguard::views;
@@ -25,6 +32,7 @@ using namespace margelo::nitro::scrollguard::views;
  * Represents the React Native View holder for the Nitro "ScrollGuard" HybridView.
  */
 @interface HybridScrollGuardComponent: RCTViewComponentView
++ (BOOL)shouldBeRecycled;
 @end
 
 @implementation HybridScrollGuardComponent {
@@ -93,4 +101,22 @@ using namespace margelo::nitro::scrollguard::views;
   [super updateProps:props oldProps:oldProps];
 }
 
++ (BOOL)shouldBeRecycled {
+  return ScrollGuard::ScrollGuardAutolinking::isScrollGuardRecyclable();
+}
+
+- (void)prepareForRecycle {
+  [super prepareForRecycle];
+  ScrollGuard::HybridScrollGuardSpec_cxx& swiftPart = _hybridView->getSwiftPart();
+  swiftPart.maybePrepareForRecycle();
+}
+
+#ifdef ENABLE_RCT_COMPONENT_VIEW_INVALIDATE
+- (void)invalidate {
+  ScrollGuard::HybridScrollGuardSpec_cxx& swiftPart = _hybridView->getSwiftPart();
+  swiftPart.onDropView();
+  [super invalidate];
+}
+#endif
+
 @end

package/lib/nitrogen/generated/ios/swift/HybridScrollGuardSpec.swift

@@ -2,10 +2,9 @@
 /// HybridScrollGuardSpec.swift
 /// 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
 ///
 
-import Foundation
 import NitroModules
 
 /// See ``HybridScrollGuardSpec``
@@ -30,14 +29,14 @@ open class HybridScrollGuardSpec_base {
   public init() { }
   public func getCxxWrapper() -> HybridScrollGuardSpec_cxx {
   #if DEBUG
-    guard self is HybridScrollGuardSpec else {
+    guard self is any HybridScrollGuardSpec else {
       fatalError("`self` is not a `HybridScrollGuardSpec`! Did you accidentally inherit from `HybridScrollGuardSpec_base` instead of `HybridScrollGuardSpec`?")
     }
   #endif
     if let cxxWrapper = self.cxxWrapper {
       return cxxWrapper
     } else {
-      let cxxWrapper = HybridScrollGuardSpec_cxx(self as! HybridScrollGuardSpec)
+      let cxxWrapper = HybridScrollGuardSpec_cxx(self as! any HybridScrollGuardSpec)
       self.cxxWrapper = cxxWrapper
       return cxxWrapper
     }

package/lib/nitrogen/generated/ios/swift/HybridScrollGuardSpec_cxx.swift

@@ -2,10 +2,9 @@
 /// HybridScrollGuardSpec_cxx.swift
 /// 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
 ///
 
-import Foundation
 import NitroModules
 
 /**
@@ -96,6 +95,14 @@ open class HybridScrollGuardSpec_cxx {
     return MemoryHelper.getSizeOf(self.__implementation) + self.__implementation.memorySize
   }
 
+  /**
+   * Compares this object with the given [other] object for reference equality.
+   */
+  @inline(__always)
+  public func equals(other: HybridScrollGuardSpec_cxx) -> Bool {
+    return self.__implementation === other.__implementation
+  }
+
   /**
    * Call dispose() on the Swift class.
    * This _may_ be called manually from JS.
@@ -143,4 +150,13 @@ open class HybridScrollGuardSpec_cxx {
   public final func afterUpdate() {
     __implementation.afterUpdate()
   }
+  
+  public final func maybePrepareForRecycle() {
+    guard let recyclable = __implementation as? any RecyclableView else { return }
+    recyclable.prepareForRecycle()
+  }
+  
+  public final func onDropView() {
+    __implementation.onDropView()
+  }
 }

package/lib/nitrogen/generated/ios/swift/ScrollGuardDirection.swift

@@ -2,7 +2,7 @@
 /// ScrollGuardDirection.swift
 /// 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/lib/nitrogen/generated/shared/c++/HybridScrollGuardSpec.cpp

@@ -2,7 +2,7 @@
 /// HybridScrollGuardSpec.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 "HybridScrollGuardSpec.hpp"

package/lib/nitrogen/generated/shared/c++/HybridScrollGuardSpec.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

package/lib/nitrogen/generated/shared/c++/ScrollGuardDirection.hpp

@@ -2,7 +2,7 @@
 /// ScrollGuardDirection.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

package/lib/nitrogen/generated/shared/c++/views/HybridScrollGuardComponent.cpp

@@ -2,7 +2,7 @@
 /// HybridScrollGuardComponent.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 "HybridScrollGuardComponent.hpp"
@@ -12,6 +12,7 @@
 #include <utility>
 #include <NitroModules/NitroDefines.hpp>
 #include <NitroModules/JSIConverter.hpp>
+#include <NitroModules/PropNameIDCache.hpp>
 #include <react/renderer/core/RawValue.h>
 #include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/core/ComponentDescriptor.h>
@@ -40,17 +41,12 @@ namespace margelo::nitro::scrollguard::views {
         const react::RawValue* rawValue = rawProps.at("hybridRef", nullptr, nullptr);
         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<HybridScrollGuardSpec>& /* ref */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.hybridRef);
+        return CachedProp<std::optional<std::function<void(const std::shared_ptr<HybridScrollGuardSpec>& /* ref */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, PropNameIDCache::get(*runtime, "f")), sourceProps.hybridRef);
       } catch (const std::exception& exc) {
         throw std::runtime_error(std::string("ScrollGuard.hybridRef: ") + exc.what());
       }
     }()) { }
 
-  HybridScrollGuardProps::HybridScrollGuardProps(const HybridScrollGuardProps& other):
-    react::ViewProps(),
-    direction(other.direction),
-    hybridRef(other.hybridRef) { }
-
   bool HybridScrollGuardProps::filterObjectKeys(const std::string& propName) {
     switch (hashString(propName)) {
       case hashString("direction"): return true;
@@ -76,10 +72,10 @@ namespace margelo::nitro::scrollguard::views {
   void HybridScrollGuardComponentDescriptor::adopt(react::ShadowNode& shadowNode) const {
     // This is called immediately after `ShadowNode` is created, cloned or in progress.
     // On Android, we need to wrap props in our state, which gets routed through Java and later unwrapped in JNI/C++.
-    auto& concreteShadowNode = dynamic_cast<HybridScrollGuardShadowNode&>(shadowNode);
-    const HybridScrollGuardProps& props = concreteShadowNode.getConcreteProps();
-    HybridScrollGuardState state;
-    state.setProps(props);
+    auto& concreteShadowNode = static_cast<HybridScrollGuardShadowNode&>(shadowNode);
+    const std::shared_ptr<const HybridScrollGuardProps>& constProps = concreteShadowNode.getConcreteSharedProps();
+    const std::shared_ptr<HybridScrollGuardProps>& props = std::const_pointer_cast<HybridScrollGuardProps>(constProps);
+    HybridScrollGuardState state{props};
     concreteShadowNode.setStateData(std::move(state));
   }
 #endif

package/lib/nitrogen/generated/shared/c++/views/HybridScrollGuardComponent.hpp

@@ -2,7 +2,7 @@
 /// HybridScrollGuardComponent.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
@@ -37,7 +37,6 @@ namespace margelo::nitro::scrollguard::views {
   class HybridScrollGuardProps final: public react::ViewProps {
   public:
     HybridScrollGuardProps() = default;
-    HybridScrollGuardProps(const HybridScrollGuardProps&);
     HybridScrollGuardProps(const react::PropsParserContext& context,
                            const HybridScrollGuardProps& sourceProps,
                            const react::RawProps& rawProps);
@@ -56,10 +55,14 @@ namespace margelo::nitro::scrollguard::views {
   class HybridScrollGuardState final {
   public:
     HybridScrollGuardState() = default;
+    explicit HybridScrollGuardState(const std::shared_ptr<HybridScrollGuardProps>& props):
+      _props(props) {}
 
   public:
-    void setProps(const HybridScrollGuardProps& props) { _props.emplace(props); }
-    const std::optional<HybridScrollGuardProps>& getProps() const { return _props; }
+    [[nodiscard]]
+    const std::shared_ptr<HybridScrollGuardProps>& getProps() const {
+      return _props;
+    }
 
   public:
 #ifdef ANDROID
@@ -73,7 +76,7 @@ namespace margelo::nitro::scrollguard::views {
 #endif
 
   private:
-    std::optional<HybridScrollGuardProps> _props;
+    std::shared_ptr<HybridScrollGuardProps> _props;
   };
 
   /**
@@ -89,7 +92,7 @@ namespace margelo::nitro::scrollguard::views {
    */
   class HybridScrollGuardComponentDescriptor final: public react::ConcreteComponentDescriptor<HybridScrollGuardShadowNode> {
   public:
-    HybridScrollGuardComponentDescriptor(const react::ComponentDescriptorParameters& parameters);
+    explicit HybridScrollGuardComponentDescriptor(const react::ComponentDescriptorParameters& parameters);
 
   public:
     /**

package/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/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/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/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/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: