@onekeyfe/react-native-skeleton 3.0.81 → 3.0.82

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

@@ -2,19 +2,16 @@
 /// SkeletonAutolinking.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 SkeletonAutolinking {
   public typealias bridge = margelo.nitro.skeleton.bridge.swift
 
-  /**
-   * Creates an instance of a Swift class that implements `HybridSkeletonSpec`,
-   * and wraps it in a Swift class that can directly interop with C++ (`HybridSkeletonSpec_cxx`)
-   *
-   * This is generated by Nitrogen and will initialize the class specified
-   * in the `"autolinking"` property of `nitro.json` (in this case, `HybridSkeleton`).
-   */
   public static func createSkeleton() -> bridge.std__shared_ptr_HybridSkeletonSpec_ {
     let hybridObject = HybridSkeleton()
     return { () -> bridge.std__shared_ptr_HybridSkeletonSpec_ in
@@ -22,4 +19,8 @@ public final class SkeletonAutolinking {
       return __cxxWrapped.getCxxPart()
     }()
   }
+  
+  public static func isSkeletonRecyclable() -> Bool {
+    return HybridSkeleton.self is any RecyclableView.Type
+  }
 }

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

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

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

@@ -2,7 +2,7 @@
 /// HybridSkeletonSpecSwift.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::skeleton {
     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<HybridSkeletonSpecSwift>(other)) {
+        return _swiftPart.equals(otherCast->_swiftPart);
+      }
+      return false;
+    }
     void dispose() noexcept override {
       _swiftPart.dispose();
     }

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

@@ -2,7 +2,7 @@
 /// HybridSkeletonComponent.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 "HybridSkeletonComponent.hpp"
@@ -17,6 +17,13 @@
 #import "HybridSkeletonSpecSwift.hpp"
 #import "Skeleton-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::skeleton;
 using namespace margelo::nitro::skeleton::views;
@@ -25,6 +32,7 @@ using namespace margelo::nitro::skeleton::views;
  * Represents the React Native View holder for the Nitro "Skeleton" HybridView.
  */
 @interface HybridSkeletonComponent: RCTViewComponentView
++ (BOOL)shouldBeRecycled;
 @end
 
 @implementation HybridSkeletonComponent {
@@ -98,4 +106,22 @@ using namespace margelo::nitro::skeleton::views;
   [super updateProps:props oldProps:oldProps];
 }
 
++ (BOOL)shouldBeRecycled {
+  return Skeleton::SkeletonAutolinking::isSkeletonRecyclable();
+}
+
+- (void)prepareForRecycle {
+  [super prepareForRecycle];
+  Skeleton::HybridSkeletonSpec_cxx& swiftPart = _hybridView->getSwiftPart();
+  swiftPart.maybePrepareForRecycle();
+}
+
+#ifdef ENABLE_RCT_COMPONENT_VIEW_INVALIDATE
+- (void)invalidate {
+  Skeleton::HybridSkeletonSpec_cxx& swiftPart = _hybridView->getSwiftPart();
+  swiftPart.onDropView();
+  [super invalidate];
+}
+#endif
+
 @end

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

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

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

@@ -2,10 +2,9 @@
 /// HybridSkeletonSpec_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 HybridSkeletonSpec_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: HybridSkeletonSpec_cxx) -> Bool {
+    return self.__implementation === other.__implementation
+  }
+
   /**
    * Call dispose() on the Swift class.
    * This _may_ be called manually from JS.
@@ -127,7 +134,14 @@ open class HybridSkeletonSpec_cxx {
     }
     @inline(__always)
     set {
-      self.__implementation.shimmerSpeed = newValue.value
+      self.__implementation.shimmerSpeed = { () -> Double? in
+        if bridge.has_value_std__optional_double_(newValue) {
+          let __unwrapped = bridge.get_std__optional_double_(newValue)
+          return __unwrapped
+        } else {
+          return nil
+        }
+      }()
     }
   }
   
@@ -173,4 +187,13 @@ open class HybridSkeletonSpec_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/shared/c++/HybridSkeletonSpec.cpp

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

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

@@ -2,7 +2,7 @@
 /// HybridSkeletonSpec.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/HybridSkeletonComponent.cpp

@@ -2,7 +2,7 @@
 /// HybridSkeletonComponent.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 "HybridSkeletonComponent.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>
@@ -50,18 +51,12 @@ namespace margelo::nitro::skeleton::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<HybridSkeletonSpec>& /* ref */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, "f"), sourceProps.hybridRef);
+        return CachedProp<std::optional<std::function<void(const std::shared_ptr<HybridSkeletonSpec>& /* 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("Skeleton.hybridRef: ") + exc.what());
       }
     }()) { }
 
-  HybridSkeletonProps::HybridSkeletonProps(const HybridSkeletonProps& other):
-    react::ViewProps(),
-    shimmerSpeed(other.shimmerSpeed),
-    shimmerGradientColors(other.shimmerGradientColors),
-    hybridRef(other.hybridRef) { }
-
   bool HybridSkeletonProps::filterObjectKeys(const std::string& propName) {
     switch (hashString(propName)) {
       case hashString("shimmerSpeed"): return true;
@@ -88,10 +83,10 @@ namespace margelo::nitro::skeleton::views {
   void HybridSkeletonComponentDescriptor::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<HybridSkeletonShadowNode&>(shadowNode);
-    const HybridSkeletonProps& props = concreteShadowNode.getConcreteProps();
-    HybridSkeletonState state;
-    state.setProps(props);
+    auto& concreteShadowNode = static_cast<HybridSkeletonShadowNode&>(shadowNode);
+    const std::shared_ptr<const HybridSkeletonProps>& constProps = concreteShadowNode.getConcreteSharedProps();
+    const std::shared_ptr<HybridSkeletonProps>& props = std::const_pointer_cast<HybridSkeletonProps>(constProps);
+    HybridSkeletonState state{props};
     concreteShadowNode.setStateData(std::move(state));
   }
 #endif

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

@@ -2,7 +2,7 @@
 /// HybridSkeletonComponent.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
@@ -38,7 +38,6 @@ namespace margelo::nitro::skeleton::views {
   class HybridSkeletonProps final: public react::ViewProps {
   public:
     HybridSkeletonProps() = default;
-    HybridSkeletonProps(const HybridSkeletonProps&);
     HybridSkeletonProps(const react::PropsParserContext& context,
                         const HybridSkeletonProps& sourceProps,
                         const react::RawProps& rawProps);
@@ -58,10 +57,14 @@ namespace margelo::nitro::skeleton::views {
   class HybridSkeletonState final {
   public:
     HybridSkeletonState() = default;
+    explicit HybridSkeletonState(const std::shared_ptr<HybridSkeletonProps>& props):
+      _props(props) {}
 
   public:
-    void setProps(const HybridSkeletonProps& props) { _props.emplace(props); }
-    const std::optional<HybridSkeletonProps>& getProps() const { return _props; }
+    [[nodiscard]]
+    const std::shared_ptr<HybridSkeletonProps>& getProps() const {
+      return _props;
+    }
 
   public:
 #ifdef ANDROID
@@ -75,7 +78,7 @@ namespace margelo::nitro::skeleton::views {
 #endif
 
   private:
-    std::optional<HybridSkeletonProps> _props;
+    std::shared_ptr<HybridSkeletonProps> _props;
   };
 
   /**
@@ -91,7 +94,7 @@ namespace margelo::nitro::skeleton::views {
    */
   class HybridSkeletonComponentDescriptor final: public react::ConcreteComponentDescriptor<HybridSkeletonShadowNode> {
   public:
-    HybridSkeletonComponentDescriptor(const react::ComponentDescriptorParameters& parameters);
+    explicit HybridSkeletonComponentDescriptor(const react::ComponentDescriptorParameters& parameters);
 
   public:
     /**

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

@@ -2,7 +2,7 @@
 /// JHybridSkeletonSpec.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 "JHybridSkeletonSpec.hpp"
@@ -15,44 +15,45 @@
 
 namespace margelo::nitro::skeleton {
 
-  jni::local_ref<JHybridSkeletonSpec::jhybriddata> JHybridSkeletonSpec::initHybrid(jni::alias_ref<jhybridobject> jThis) {
-    return makeCxxInstance(jThis);
-  }
-
-  void JHybridSkeletonSpec::registerNatives() {
-    registerHybrid({
-      makeNativeMethod("initHybrid", JHybridSkeletonSpec::initHybrid),
-    });
+  std::shared_ptr<JHybridSkeletonSpec> JHybridSkeletonSpec::JavaPart::getJHybridSkeletonSpec() {
+    auto hybridObject = JHybridObject::JavaPart::getJHybridObject();
+    auto castHybridObject = std::dynamic_pointer_cast<JHybridSkeletonSpec>(hybridObject);
+    if (castHybridObject == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to downcast JHybridObject to JHybridSkeletonSpec!");
+    }
+    return castHybridObject;
   }
 
-  size_t JHybridSkeletonSpec::getExternalMemorySize() noexcept {
-    static const auto method = javaClassStatic()->getMethod<jlong()>("getMemorySize");
-    return method(_javaPart);
+  jni::local_ref<JHybridSkeletonSpec::CxxPart::jhybriddata> JHybridSkeletonSpec::CxxPart::initHybrid(jni::alias_ref<jhybridobject> jThis) {
+    return makeCxxInstance(jThis);
   }
 
-  void JHybridSkeletonSpec::dispose() noexcept {
-    static const auto method = javaClassStatic()->getMethod<void()>("dispose");
-    method(_javaPart);
+  std::shared_ptr<JHybridObject> JHybridSkeletonSpec::CxxPart::createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) {
+    auto castJavaPart = jni::dynamic_ref_cast<JHybridSkeletonSpec::JavaPart>(javaPart);
+    if (castJavaPart == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to cast JHybridObject::JavaPart to JHybridSkeletonSpec::JavaPart!");
+    }
+    return std::make_shared<JHybridSkeletonSpec>(castJavaPart);
   }
 
-  std::string JHybridSkeletonSpec::toString() {
-    static const auto method = javaClassStatic()->getMethod<jni::JString()>("toString");
-    auto javaString = method(_javaPart);
-    return javaString->toStdString();
+  void JHybridSkeletonSpec::CxxPart::registerNatives() {
+    registerHybrid({
+      makeNativeMethod("initHybrid", JHybridSkeletonSpec::CxxPart::initHybrid),
+    });
   }
 
   // Properties
   std::optional<double> JHybridSkeletonSpec::getShimmerSpeed() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<jni::JDouble>()>("getShimmerSpeed");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JDouble>()>("getShimmerSpeed");
     auto __result = method(_javaPart);
     return __result != nullptr ? std::make_optional(__result->value()) : std::nullopt;
   }
   void JHybridSkeletonSpec::setShimmerSpeed(std::optional<double> shimmerSpeed) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JDouble> /* shimmerSpeed */)>("setShimmerSpeed");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JDouble> /* shimmerSpeed */)>("setShimmerSpeed");
     method(_javaPart, shimmerSpeed.has_value() ? jni::JDouble::valueOf(shimmerSpeed.value()) : nullptr);
   }
   std::optional<std::vector<std::string>> JHybridSkeletonSpec::getShimmerGradientColors() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<jni::JArrayClass<jni::JString>>()>("getShimmerGradientColors");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JArrayClass<jni::JString>>()>("getShimmerGradientColors");
     auto __result = method(_javaPart);
     return __result != nullptr ? std::make_optional([&]() {
       size_t __size = __result->size();
@@ -66,7 +67,7 @@ namespace margelo::nitro::skeleton {
     }()) : std::nullopt;
   }
   void JHybridSkeletonSpec::setShimmerGradientColors(const std::optional<std::vector<std::string>>& shimmerGradientColors) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JArrayClass<jni::JString>> /* shimmerGradientColors */)>("setShimmerGradientColors");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JArrayClass<jni::JString>> /* shimmerGradientColors */)>("setShimmerGradientColors");
     method(_javaPart, shimmerGradientColors.has_value() ? [&]() {
       size_t __size = shimmerGradientColors.value().size();
       jni::local_ref<jni::JArrayClass<jni::JString>> __array = jni::JArrayClass<jni::JString>::newArray(__size);

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

@@ -2,7 +2,7 @@
 /// HybridSkeletonSpec.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::skeleton {
 
   using namespace facebook;
 
-  class JHybridSkeletonSpec: public jni::HybridClass<JHybridSkeletonSpec, JHybridObject>,
-                             public virtual HybridSkeletonSpec {
+  class JHybridSkeletonSpec: public virtual HybridSkeletonSpec, public virtual JHybridObject {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/skeleton/HybridSkeletonSpec;";
-    static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
-    static void registerNatives();
-
-  protected:
-    // C++ constructor (called from Java via `initHybrid()`)
-    explicit JHybridSkeletonSpec(jni::alias_ref<jhybridobject> jThis) :
-      HybridObject(HybridSkeletonSpec::TAG),
-      HybridBase(jThis),
-      _javaPart(jni::make_global(jThis)) {}
+    struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/skeleton/HybridSkeletonSpec;";
+      std::shared_ptr<JHybridSkeletonSpec> getJHybridSkeletonSpec();
+    };
+    struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/skeleton/HybridSkeletonSpec$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 JHybridSkeletonSpec(const jni::local_ref<JHybridSkeletonSpec::JavaPart>& javaPart):
+      HybridObject(HybridSkeletonSpec::TAG),
+      JHybridObject(javaPart),
+      _javaPart(jni::make_global(javaPart)) {}
     ~JHybridSkeletonSpec() 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<JHybridSkeletonSpec::javaobject>& getJavaPart() const noexcept {
+    inline const jni::global_ref<JHybridSkeletonSpec::JavaPart>& getJavaPart() const noexcept {
       return _javaPart;
     }
 
@@ -60,9 +60,7 @@ namespace margelo::nitro::skeleton {
     
 
   private:
-    friend HybridBase;
-    using HybridBase::HybridBase;
-    jni::global_ref<JHybridSkeletonSpec::javaobject> _javaPart;
+    jni::global_ref<JHybridSkeletonSpec::JavaPart> _javaPart;
   };
 
 } // namespace margelo::nitro::skeleton

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

@@ -2,12 +2,13 @@
 /// JHybridSkeletonStateUpdater.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 "JHybridSkeletonStateUpdater.hpp"
 #include "views/HybridSkeletonComponent.hpp"
 #include <NitroModules/NitroDefines.hpp>
+#include <react/fabric/StateWrapperImpl.h>
 
 namespace margelo::nitro::skeleton::views {
 
@@ -15,45 +16,44 @@ using namespace facebook;
 using ConcreteStateData = react::ConcreteState<HybridSkeletonState>;
 
 void JHybridSkeletonStateUpdater::updateViewProps(jni::alias_ref<jni::JClass> /* class */,
-                                           jni::alias_ref<JHybridSkeletonSpec::javaobject> javaView,
+                                           jni::alias_ref<JHybridSkeletonSpec::JavaPart> javaView,
                                            jni::alias_ref<JStateWrapper::javaobject> stateWrapperInterface) {
-  JHybridSkeletonSpec* view = javaView->cthis();
+  std::shared_ptr<JHybridSkeletonSpec> hybridView = javaView->getJHybridSkeletonSpec();
 
   // 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 HybridSkeletonState& data = concreteState->getData();
-  const std::optional<HybridSkeletonProps>& maybeProps = data.getProps();
-  if (!maybeProps.has_value()) {
+  const std::shared_ptr<HybridSkeletonProps>& props = data.getProps();
+  if (props == nullptr) [[unlikely]] {
     // Props aren't set yet!
     throw std::runtime_error("HybridSkeletonState's data doesn't contain any props!");
   }
-  const HybridSkeletonProps& props = maybeProps.value();
-  if (props.shimmerSpeed.isDirty) {
-    view->setShimmerSpeed(props.shimmerSpeed.value);
-    // TODO: Set isDirty = false
+
+  // Update all props if they are dirty
+  if (props->shimmerSpeed.isDirty) {
+    hybridView->setShimmerSpeed(props->shimmerSpeed.value);
+    props->shimmerSpeed.isDirty = false;
   }
-  if (props.shimmerGradientColors.isDirty) {
-    view->setShimmerGradientColors(props.shimmerGradientColors.value);
-    // TODO: Set isDirty = false
+  if (props->shimmerGradientColors.isDirty) {
+    hybridView->setShimmerGradientColors(props->shimmerGradientColors.value);
+    props->shimmerGradientColors.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<JHybridSkeletonSpec> shared = javaView->cthis()->shared_cast<JHybridSkeletonSpec>();
-      maybeFunc.value()(shared);
+      maybeFunc.value()(hybridView);
     }
-    // TODO: Set isDirty = false
+    props->hybridRef.isDirty = false;
   }
 }
 

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

@@ -2,7 +2,7 @@
 /// JHybridSkeletonStateUpdater.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::skeleton::views {
 
 using namespace facebook;
 
-class JHybridSkeletonStateUpdater: public jni::JavaClass<JHybridSkeletonStateUpdater> {
+class JHybridSkeletonStateUpdater final: public jni::JavaClass<JHybridSkeletonStateUpdater> {
 public:
   static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/skeleton/views/HybridSkeletonStateUpdater;";
 
 public:
   static void updateViewProps(jni::alias_ref<jni::JClass> /* class */,
-                              jni::alias_ref<JHybridSkeletonSpec::javaobject> view,
+                              jni::alias_ref<JHybridSkeletonSpec::JavaPart> view,
                               jni::alias_ref<JStateWrapper::javaobject> stateWrapperInterface);
 
 public: