@onekeyfe/react-native-skeleton 3.0.96 → 3.0.98

package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/skeleton/views/HybridSkeletonManager.kt

@@ -20,6 +20,14 @@ import com.margelo.nitro.skeleton.*
  * Represents the React Native `ViewManager` for the "Skeleton" Nitro HybridView.
  */
 public class HybridSkeletonManager: SimpleViewManager<View>() {
+  /**
+   * Represents the View and its last state snapshot (mutable)
+   */
+  private class HybridViewHolder(
+    val hybridView: HybridSkeleton,
+    var lastState: StateWrapper? = null,
+  )
+
   init {
     if (RecyclableView::class.java.isAssignableFrom(HybridSkeleton::class.java)) {
       // Enable view recycling
@@ -34,33 +42,41 @@ public class HybridSkeletonManager: SimpleViewManager<View>() {
   override fun createViewInstance(reactContext: ThemedReactContext): View {
     val hybridView = HybridSkeleton(reactContext)
     val view = hybridView.view
-    view.setTag(associated_hybrid_view_tag, hybridView)
+    view.setTag(associated_hybrid_view_tag, HybridViewHolder(hybridView))
     return view
   }
 
   override fun updateState(view: View, props: ReactStylesDiffMap, stateWrapper: StateWrapper): Any? {
-    val hybridView = getHybridView(view)
+    val holder = getHybridViewHolder(view)
       ?: throw Error("Couldn't find view $view in local views table!")
+    val hybridView = holder.hybridView
+    val oldState = holder.lastState
+    val newState = stateWrapper
 
     // 1. Update each prop individually
     hybridView.beforeUpdate()
-    HybridSkeletonStateUpdater.updateViewProps(hybridView, stateWrapper)
+    HybridSkeletonStateUpdater.updateViewProps(hybridView, newState, oldState)
     hybridView.afterUpdate()
+    holder.lastState = newState
 
     // 2. Continue in base View props
-    return super.updateState(view, props, stateWrapper)
+    return super.updateState(view, props, newState)
   }
 
   override fun onDropViewInstance(view: View) {
-    val hybridView = getHybridView(view)
-    hybridView?.onDropView()
+    val holder = getHybridViewHolder(view)
+    holder?.lastState = null
+    holder?.hybridView?.onDropView()
     return super.onDropViewInstance(view)
   }
 
   protected override fun prepareToRecycleView(reactContext: ThemedReactContext, view: View): View? {
-    super.prepareToRecycleView(reactContext, view)
-    val hybridView = getHybridView(view)
+    val preparedView = super.prepareToRecycleView(reactContext, view)
+      ?: return null
+    val holder = getHybridViewHolder(preparedView)
       ?: return null
+    val hybridView = holder.hybridView
+    holder.lastState = null
 
     @Suppress("USELESS_IS_CHECK")
     if (hybridView is RecyclableView) {
@@ -74,7 +90,7 @@ public class HybridSkeletonManager: SimpleViewManager<View>() {
     }
   }
 
-  private fun getHybridView(view: View): HybridSkeleton? {
-    return view.getTag(associated_hybrid_view_tag) as? HybridSkeleton
+  private fun getHybridViewHolder(view: View): HybridViewHolder? {
+    return view.getTag(associated_hybrid_view_tag) as? HybridViewHolder
   }
 }

package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/skeleton/views/HybridSkeletonStateUpdater.kt

@@ -14,10 +14,10 @@ internal class HybridSkeletonStateUpdater {
   companion object {
     /**
      * Updates the props for [view] through C++.
-     * The [state] prop is expected to contain [view]'s props as wrapped Fabric state.
+     * The [newState] prop is expected to contain [view]'s props as wrapped Fabric state.
      */
     @Suppress("KotlinJniMissingFunction")
     @JvmStatic
-    external fun updateViewProps(view: HybridSkeletonSpec, state: StateWrapper)
+    external fun updateViewProps(view: HybridSkeletonSpec, newState: StateWrapper, oldState: StateWrapper?)
   }
 }

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

@@ -37,6 +37,7 @@ using namespace margelo::nitro::skeleton::views;
 
 @implementation HybridSkeletonComponent {
   std::shared_ptr<HybridSkeletonSpecSwift> _hybridView;
+  BOOL _didDropView;
 }
 
 + (void) load {
@@ -50,6 +51,7 @@ using namespace margelo::nitro::skeleton::views;
 
 - (instancetype) init {
   if (self = [super init]) {
+    _props = HybridSkeletonShadowNode::defaultSharedProps();
     std::shared_ptr<HybridSkeletonSpec> hybridView = Skeleton::SkeletonAutolinking::createSkeleton();
     _hybridView = std::dynamic_pointer_cast<HybridSkeletonSpecSwift>(hybridView);
     [self updateView];
@@ -69,40 +71,61 @@ using namespace margelo::nitro::skeleton::views;
   [self setContentView:view];
 }
 
+- (void) notifyOnDropView {
+  // A recycled component can later be invalidated. Notify only once per mount.
+  if (_didDropView) {
+    return;
+  }
+  Skeleton::HybridSkeletonSpec_cxx& swiftPart = _hybridView->getSwiftPart();
+  swiftPart.onDropView();
+  _didDropView = YES;
+}
+
 - (void) updateProps:(const std::shared_ptr<const react::Props>&)props
             oldProps:(const std::shared_ptr<const react::Props>&)oldProps {
+  // A props update marks a newly mounted or still-active component.
+  _didDropView = NO;
+
   // 1. Downcast props
-  const auto& newViewPropsConst = *std::static_pointer_cast<HybridSkeletonProps const>(props);
-  auto& newViewProps = const_cast<HybridSkeletonProps&>(newViewPropsConst);
+  const auto& newViewProps = *std::static_pointer_cast<const HybridSkeletonProps>(props);
+  const auto* oldViewProps = static_cast<const HybridSkeletonProps*>(oldProps.get());
   Skeleton::HybridSkeletonSpec_cxx& swiftPart = _hybridView->getSwiftPart();
 
-  // 2. Update each prop individually
-  swiftPart.beforeUpdate();
-
-  // shimmerSpeed: optional
-  if (newViewProps.shimmerSpeed.isDirty) {
-    swiftPart.setShimmerSpeed(newViewProps.shimmerSpeed.value);
-    newViewProps.shimmerSpeed.isDirty = false;
-  }
-  // shimmerGradientColors: optional
-  if (newViewProps.shimmerGradientColors.isDirty) {
-    swiftPart.setShimmerGradientColors(newViewProps.shimmerGradientColors.value);
-    newViewProps.shimmerGradientColors.isDirty = false;
-  }
-
-  swiftPart.afterUpdate();
+  // 2. Update only props that differ from the previous Props snapshot.
+  const bool hasTransactionPropChanges = oldViewProps == nullptr
+      ? newViewProps.hasAnyProvidedProps()
+      : !newViewProps.hasSameProps(*oldViewProps);
+  if (hasTransactionPropChanges) {
+    swiftPart.beforeUpdate();
+
+    // shimmerSpeed: optional
+    if (oldViewProps == nullptr
+          ? newViewProps.shimmerSpeed.isProvided()
+          : !newViewProps.shimmerSpeed.hasSameValue(oldViewProps->shimmerSpeed)) {
+      swiftPart.setShimmerSpeed(newViewProps.shimmerSpeed.get());
+    }
+    // shimmerGradientColors: optional
+    if (oldViewProps == nullptr
+          ? newViewProps.shimmerGradientColors.isProvided()
+          : !newViewProps.shimmerGradientColors.hasSameValue(oldViewProps->shimmerGradientColors)) {
+      swiftPart.setShimmerGradientColors(newViewProps.shimmerGradientColors.get());
+    }
 
-  // 3. Update hybridRef if it changed
-  if (newViewProps.hybridRef.isDirty) {
-    // hybridRef changed - call it with new this
-    const auto& maybeFunc = newViewProps.hybridRef.value;
-    if (maybeFunc.has_value()) {
-      maybeFunc.value()(_hybridView);
+    // Update hybridRef if it changed
+    if (oldViewProps == nullptr
+          ? newViewProps.hybridRef.isProvided()
+          : !newViewProps.hybridRef.hasSameValue(oldViewProps->hybridRef)) {
+      // hybridRef changed - call it with new this
+      const auto& maybeFunc = newViewProps.hybridRef.get();
+      if (maybeFunc.has_value()) {
+        maybeFunc.value()(_hybridView);
+      }
     }
-    newViewProps.hybridRef.isDirty = false;
+
+    swiftPart.afterUpdate();
   }
 
-  // 4. Continue in base class
+  // 3. Continue in base class
   [super updateProps:props oldProps:oldProps];
 }
 
@@ -111,6 +134,7 @@ using namespace margelo::nitro::skeleton::views;
 }
 
 - (void)prepareForRecycle {
+  [self notifyOnDropView];
   [super prepareForRecycle];
   Skeleton::HybridSkeletonSpec_cxx& swiftPart = _hybridView->getSwiftPart();
   swiftPart.maybePrepareForRecycle();
@@ -118,8 +142,7 @@ using namespace margelo::nitro::skeleton::views;
 
 #ifdef ENABLE_RCT_COMPONENT_VIEW_INVALIDATE
 - (void)invalidate {
-  Skeleton::HybridSkeletonSpec_cxx& swiftPart = _hybridView->getSwiftPart();
-  swiftPart.onDropView();
+  [self notifyOnDropView];
   [super invalidate];
 }
 #endif

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

@@ -7,55 +7,22 @@
 
 #include "HybridSkeletonComponent.hpp"
 
-#include <string>
-#include <exception>
-#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>
-#include <react/renderer/components/view/ViewProps.h>
+#include <NitroModules/NitroHash.hpp>
+#include <NitroModules/ReactProp.hpp>
 
 namespace margelo::nitro::skeleton::views {
 
+  using namespace facebook;
+
   extern const char HybridSkeletonComponentName[] = "Skeleton";
 
   HybridSkeletonProps::HybridSkeletonProps(const react::PropsParserContext& context,
                                            const HybridSkeletonProps& sourceProps,
                                            const react::RawProps& rawProps):
     react::ViewProps(context, sourceProps, rawProps, filterObjectKeys),
-    shimmerSpeed([&]() -> CachedProp<std::optional<double>> {
-      try {
-        const react::RawValue* rawValue = rawProps.at("shimmerSpeed", nullptr, nullptr);
-        if (rawValue == nullptr) return sourceProps.shimmerSpeed;
-        const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<double>>::fromRawValue(*runtime, value, sourceProps.shimmerSpeed);
-      } catch (const std::exception& exc) {
-        throw std::runtime_error(std::string("Skeleton.shimmerSpeed: ") + exc.what());
-      }
-    }()),
-    shimmerGradientColors([&]() -> CachedProp<std::optional<std::vector<std::string>>> {
-      try {
-        const react::RawValue* rawValue = rawProps.at("shimmerGradientColors", nullptr, nullptr);
-        if (rawValue == nullptr) return sourceProps.shimmerGradientColors;
-        const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<std::vector<std::string>>>::fromRawValue(*runtime, value, sourceProps.shimmerGradientColors);
-      } catch (const std::exception& exc) {
-        throw std::runtime_error(std::string("Skeleton.shimmerGradientColors: ") + exc.what());
-      }
-    }()),
-    hybridRef([&]() -> CachedProp<std::optional<std::function<void(const std::shared_ptr<HybridSkeletonSpec>& /* ref */)>>> {
-      try {
-        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, PropNameIDCache::get(*runtime, "f")), sourceProps.hybridRef);
-      } catch (const std::exception& exc) {
-        throw std::runtime_error(std::string("Skeleton.hybridRef: ") + exc.what());
-      }
-    }()) { }
+    shimmerSpeed(nitro::ReactProp<std::optional<double>>::fromRawValue("Skeleton", "shimmerSpeed", rawProps, sourceProps.shimmerSpeed)),
+    shimmerGradientColors(nitro::ReactProp<std::optional<std::vector<std::string>>>::fromRawValue("Skeleton", "shimmerGradientColors", rawProps, sourceProps.shimmerGradientColors)),
+    hybridRef(nitro::ReactProp<std::optional<std::function<void(const std::shared_ptr<HybridSkeletonSpec>& /* ref */)>>>::fromRawValue("Skeleton", "hybridRef", rawProps, sourceProps.hybridRef)) { }
 
   bool HybridSkeletonProps::filterObjectKeys(const std::string& propName) {
     switch (hashString(propName)) {
@@ -66,29 +33,4 @@ namespace margelo::nitro::skeleton::views {
     }
   }
 
-  HybridSkeletonComponentDescriptor::HybridSkeletonComponentDescriptor(const react::ComponentDescriptorParameters& parameters)
-    : ConcreteComponentDescriptor(parameters,
-                                  react::RawPropsParser()) {}
-
-  std::shared_ptr<const react::Props> HybridSkeletonComponentDescriptor::cloneProps(const react::PropsParserContext& context,
-                                                                                    const std::shared_ptr<const react::Props>& props,
-                                                                                    react::RawProps rawProps) const {
-    // 1. Prepare raw props parser
-    rawProps.parse(rawPropsParser_);
-    // 2. Copy props with Nitro's cached copy constructor
-    return HybridSkeletonShadowNode::Props(context, /* & */ rawProps, props);
-  }
-
-#ifdef ANDROID
-  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 = 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
-
 } // namespace margelo::nitro::skeleton::views

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

@@ -7,14 +7,15 @@
 
 #pragma once
 
-#include <optional>
-#include <NitroModules/NitroDefines.hpp>
-#include <NitroModules/NitroHash.hpp>
-#include <NitroModules/CachedProp.hpp>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/core/PropsParserContext.h>
+#include <NitroModules/ReactProp.hpp>
+#include <NitroModules/ViewComponentDescriptor.hpp>
+#include <NitroModules/ViewPropsHolderState.hpp>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
+#include <react/renderer/core/RawProps.h>
+
+#include <string>
 
 #include <optional>
 #include <string>
@@ -43,9 +44,23 @@ namespace margelo::nitro::skeleton::views {
                         const react::RawProps& rawProps);
 
   public:
-    CachedProp<std::optional<double>> shimmerSpeed;
-    CachedProp<std::optional<std::vector<std::string>>> shimmerGradientColors;
-    CachedProp<std::optional<std::function<void(const std::shared_ptr<HybridSkeletonSpec>& /* ref */)>>> hybridRef;
+    nitro::ReactProp<std::optional<double>> shimmerSpeed;
+    nitro::ReactProp<std::optional<std::vector<std::string>>> shimmerGradientColors;
+    nitro::ReactProp<std::optional<std::function<void(const std::shared_ptr<HybridSkeletonSpec>& /* ref */)>>> hybridRef;
+
+    [[nodiscard]]
+    bool hasSameProps(const HybridSkeletonProps& other) const noexcept {
+      return shimmerSpeed.hasSameValue(other.shimmerSpeed) &&
+             shimmerGradientColors.hasSameValue(other.shimmerGradientColors) &&
+             hybridRef.hasSameValue(other.hybridRef);
+    }
+
+    [[nodiscard]]
+    bool hasAnyProvidedProps() const noexcept {
+      return shimmerSpeed.isProvided() ||
+             shimmerGradientColors.isProvided() ||
+             hybridRef.isProvided();
+    }
 
   private:
     static bool filterObjectKeys(const std::string& propName);
@@ -54,32 +69,7 @@ namespace margelo::nitro::skeleton::views {
   /**
    * State for the "Skeleton" View.
    */
-  class HybridSkeletonState final {
-  public:
-    HybridSkeletonState() = default;
-    explicit HybridSkeletonState(const std::shared_ptr<HybridSkeletonProps>& props):
-      _props(props) {}
-
-  public:
-    [[nodiscard]]
-    const std::shared_ptr<HybridSkeletonProps>& getProps() const {
-      return _props;
-    }
-
-  public:
-#ifdef ANDROID
-  HybridSkeletonState(const HybridSkeletonState& /* previousState */, folly::dynamic /* data */) {}
-  folly::dynamic getDynamic() const {
-    throw std::runtime_error("HybridSkeletonState does not support folly!");
-  }
-  react::MapBuffer getMapBuffer() const {
-    throw std::runtime_error("HybridSkeletonState does not support MapBuffer!");
-  };
-#endif
-
-  private:
-    std::shared_ptr<HybridSkeletonProps> _props;
-  };
+  using HybridSkeletonState = nitro::ViewPropsHolderState<HybridSkeletonProps>;
 
   /**
    * The Shadow Node for the "Skeleton" View.
@@ -92,21 +82,7 @@ namespace margelo::nitro::skeleton::views {
   /**
    * The Component Descriptor for the "Skeleton" View.
    */
-  class HybridSkeletonComponentDescriptor final: public react::ConcreteComponentDescriptor<HybridSkeletonShadowNode> {
-  public:
-    explicit HybridSkeletonComponentDescriptor(const react::ComponentDescriptorParameters& parameters);
-
-  public:
-    /**
-     * A faster path for cloning props - reuses the caching logic from `HybridSkeletonProps`.
-     */
-    std::shared_ptr<const react::Props> cloneProps(const react::PropsParserContext& context,
-                                                   const std::shared_ptr<const react::Props>& props,
-                                                   react::RawProps rawProps) const override;
-#ifdef ANDROID
-    void adopt(react::ShadowNode& shadowNode) const override;
-#endif
-  };
+  using HybridSkeletonComponentDescriptor = nitro::ViewComponentDescriptor<HybridSkeletonShadowNode>;
 
   /* The actual view for "Skeleton" needs to be implemented in platform-specific code. */
 

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

@@ -15,45 +15,64 @@ namespace margelo::nitro::skeleton::views {
 using namespace facebook;
 using ConcreteStateData = react::ConcreteState<HybridSkeletonState>;
 
-void JHybridSkeletonStateUpdater::updateViewProps(jni::alias_ref<jni::JClass> /* class */,
-                                           jni::alias_ref<JHybridSkeletonSpec::JavaPart> javaView,
-                                           jni::alias_ref<JStateWrapper::javaobject> stateWrapperInterface) {
-  std::shared_ptr<JHybridSkeletonSpec> hybridView = javaView->getJHybridSkeletonSpec();
-
+std::shared_ptr<const HybridSkeletonProps> JHybridSkeletonStateUpdater::getPropsFromStateWrapper(
+    jni::alias_ref<JStateWrapper::javaobject> stateWrapper) {
+  if (stateWrapper.get() == nullptr) {
+    return nullptr;
+  }
   // Get concrete StateWrapperImpl from passed StateWrapper interface object
-  jobject rawStateWrapper = stateWrapperInterface.get();
-  if (!stateWrapperInterface->isInstanceOf(react::StateWrapperImpl::javaClassStatic())) [[unlikely]] {
-      throw std::runtime_error("StateWrapper is not a StateWrapperImpl");
+  jobject rawStateWrapper = stateWrapper.get();
+  if (!stateWrapper->isInstanceOf(react::StateWrapperImpl::javaClassStatic())) [[unlikely]] {
+    throw std::runtime_error("StateWrapper is not a StateWrapperImpl");
+  }
+  auto stateWrapperImpl = jni::alias_ref<react::StateWrapperImpl::javaobject>{
+    static_cast<react::StateWrapperImpl::javaobject>(rawStateWrapper)
+  };
+  std::shared_ptr<const react::State> state = stateWrapperImpl->cthis()->getState();
+  if (state == nullptr) {
+    return nullptr;
   }
-  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::static_pointer_cast<const ConcreteStateData>(state);
   const HybridSkeletonState& data = concreteState->getData();
-  const std::shared_ptr<HybridSkeletonProps>& props = data.getProps();
+  const std::shared_ptr<const 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!");
   }
+  return props;
+}
+
+void JHybridSkeletonStateUpdater::updateViewProps(jni::alias_ref<jni::JClass> /* class */,
+                                           jni::alias_ref<JHybridSkeletonSpec::JavaPart> javaView,
+                                           jni::alias_ref<JStateWrapper::javaobject> newState,
+                                           jni::alias_ref<JStateWrapper::javaobject> oldState) {
+  std::shared_ptr<JHybridSkeletonSpec> hybridView = javaView->getJHybridSkeletonSpec();
+  std::shared_ptr<const HybridSkeletonProps> newProps = getPropsFromStateWrapper(newState);
+  std::shared_ptr<const HybridSkeletonProps> oldProps = getPropsFromStateWrapper(oldState);
+  if (newProps == nullptr) [[unlikely]] {
+    throw std::runtime_error("Current StateWrapper doesn't contain any props!");
+  }
 
-  // Update all props if they are dirty
-  if (props->shimmerSpeed.isDirty) {
-    hybridView->setShimmerSpeed(props->shimmerSpeed.value);
-    props->shimmerSpeed.isDirty = false;
+  // Update only props that differ from the previous State snapshot.
+  if (oldProps == nullptr
+        ? newProps->shimmerSpeed.isProvided()
+        : !newProps->shimmerSpeed.hasSameValue(oldProps->shimmerSpeed)) {
+    hybridView->setShimmerSpeed(newProps->shimmerSpeed.get());
   }
-  if (props->shimmerGradientColors.isDirty) {
-    hybridView->setShimmerGradientColors(props->shimmerGradientColors.value);
-    props->shimmerGradientColors.isDirty = false;
+  if (oldProps == nullptr
+        ? newProps->shimmerGradientColors.isProvided()
+        : !newProps->shimmerGradientColors.hasSameValue(oldProps->shimmerGradientColors)) {
+    hybridView->setShimmerGradientColors(newProps->shimmerGradientColors.get());
   }
 
   // Update hybridRef if it changed
-  if (props->hybridRef.isDirty) {
+  if (oldProps == nullptr
+        ? newProps->hybridRef.isProvided()
+        : !newProps->hybridRef.hasSameValue(oldProps->hybridRef)) {
     // hybridRef changed - call it with new this
-    const auto& maybeFunc = props->hybridRef.value;
+    const auto& maybeFunc = newProps->hybridRef.get();
     if (maybeFunc.has_value()) {
       maybeFunc.value()(hybridView);
     }
-    props->hybridRef.isDirty = false;
   }
 }
 

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

@@ -31,7 +31,12 @@ public:
 public:
   static void updateViewProps(jni::alias_ref<jni::JClass> /* class */,
                               jni::alias_ref<JHybridSkeletonSpec::JavaPart> view,
-                              jni::alias_ref<JStateWrapper::javaobject> stateWrapperInterface);
+                              jni::alias_ref<JStateWrapper::javaobject> newState,
+                              jni::alias_ref<JStateWrapper::javaobject> oldState);
+
+private:
+  static std::shared_ptr<const HybridSkeletonProps> getPropsFromStateWrapper(
+      jni::alias_ref<JStateWrapper::javaobject> stateWrapper);
 
 public:
   static void registerNatives() {

package/nitrogen/generated/android/kotlin/com/margelo/nitro/skeleton/views/HybridSkeletonManager.kt

@@ -20,6 +20,14 @@ import com.margelo.nitro.skeleton.*
  * Represents the React Native `ViewManager` for the "Skeleton" Nitro HybridView.
  */
 public class HybridSkeletonManager: SimpleViewManager<View>() {
+  /**
+   * Represents the View and its last state snapshot (mutable)
+   */
+  private class HybridViewHolder(
+    val hybridView: HybridSkeleton,
+    var lastState: StateWrapper? = null,
+  )
+
   init {
     if (RecyclableView::class.java.isAssignableFrom(HybridSkeleton::class.java)) {
       // Enable view recycling
@@ -34,33 +42,41 @@ public class HybridSkeletonManager: SimpleViewManager<View>() {
   override fun createViewInstance(reactContext: ThemedReactContext): View {
     val hybridView = HybridSkeleton(reactContext)
     val view = hybridView.view
-    view.setTag(associated_hybrid_view_tag, hybridView)
+    view.setTag(associated_hybrid_view_tag, HybridViewHolder(hybridView))
     return view
   }
 
   override fun updateState(view: View, props: ReactStylesDiffMap, stateWrapper: StateWrapper): Any? {
-    val hybridView = getHybridView(view)
+    val holder = getHybridViewHolder(view)
       ?: throw Error("Couldn't find view $view in local views table!")
+    val hybridView = holder.hybridView
+    val oldState = holder.lastState
+    val newState = stateWrapper
 
     // 1. Update each prop individually
     hybridView.beforeUpdate()
-    HybridSkeletonStateUpdater.updateViewProps(hybridView, stateWrapper)
+    HybridSkeletonStateUpdater.updateViewProps(hybridView, newState, oldState)
     hybridView.afterUpdate()
+    holder.lastState = newState
 
     // 2. Continue in base View props
-    return super.updateState(view, props, stateWrapper)
+    return super.updateState(view, props, newState)
   }
 
   override fun onDropViewInstance(view: View) {
-    val hybridView = getHybridView(view)
-    hybridView?.onDropView()
+    val holder = getHybridViewHolder(view)
+    holder?.lastState = null
+    holder?.hybridView?.onDropView()
     return super.onDropViewInstance(view)
   }
 
   protected override fun prepareToRecycleView(reactContext: ThemedReactContext, view: View): View? {
-    super.prepareToRecycleView(reactContext, view)
-    val hybridView = getHybridView(view)
+    val preparedView = super.prepareToRecycleView(reactContext, view)
+      ?: return null
+    val holder = getHybridViewHolder(preparedView)
       ?: return null
+    val hybridView = holder.hybridView
+    holder.lastState = null
 
     @Suppress("USELESS_IS_CHECK")
     if (hybridView is RecyclableView) {
@@ -74,7 +90,7 @@ public class HybridSkeletonManager: SimpleViewManager<View>() {
     }
   }
 
-  private fun getHybridView(view: View): HybridSkeleton? {
-    return view.getTag(associated_hybrid_view_tag) as? HybridSkeleton
+  private fun getHybridViewHolder(view: View): HybridViewHolder? {
+    return view.getTag(associated_hybrid_view_tag) as? HybridViewHolder
   }
 }

package/nitrogen/generated/android/kotlin/com/margelo/nitro/skeleton/views/HybridSkeletonStateUpdater.kt

@@ -14,10 +14,10 @@ internal class HybridSkeletonStateUpdater {
   companion object {
     /**
      * Updates the props for [view] through C++.
-     * The [state] prop is expected to contain [view]'s props as wrapped Fabric state.
+     * The [newState] prop is expected to contain [view]'s props as wrapped Fabric state.
      */
     @Suppress("KotlinJniMissingFunction")
     @JvmStatic
-    external fun updateViewProps(view: HybridSkeletonSpec, state: StateWrapper)
+    external fun updateViewProps(view: HybridSkeletonSpec, newState: StateWrapper, oldState: StateWrapper?)
   }
 }