@onekeyfe/react-native-perp-depth-bar 3.0.95 → 3.0.98

package/lib/nitrogen/nitrogen/generated/android/kotlin/com/margelo/nitro/perpdepthbar/views/HybridPerpSideRatioManager.kt

@@ -20,6 +20,14 @@ import com.margelo.nitro.perpdepthbar.*
  * Represents the React Native `ViewManager` for the "PerpSideRatio" Nitro HybridView.
  */
 public class HybridPerpSideRatioManager: SimpleViewManager<View>() {
+  /**
+   * Represents the View and its last state snapshot (mutable)
+   */
+  private class HybridViewHolder(
+    val hybridView: HybridPerpSideRatio,
+    var lastState: StateWrapper? = null,
+  )
+
   init {
     if (RecyclableView::class.java.isAssignableFrom(HybridPerpSideRatio::class.java)) {
       // Enable view recycling
@@ -34,33 +42,41 @@ public class HybridPerpSideRatioManager: SimpleViewManager<View>() {
   override fun createViewInstance(reactContext: ThemedReactContext): View {
     val hybridView = HybridPerpSideRatio(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()
-    HybridPerpSideRatioStateUpdater.updateViewProps(hybridView, stateWrapper)
+    HybridPerpSideRatioStateUpdater.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 HybridPerpSideRatioManager: SimpleViewManager<View>() {
     }
   }
 
-  private fun getHybridView(view: View): HybridPerpSideRatio? {
-    return view.getTag(associated_hybrid_view_tag) as? HybridPerpSideRatio
+  private fun getHybridViewHolder(view: View): HybridViewHolder? {
+    return view.getTag(associated_hybrid_view_tag) as? HybridViewHolder
   }
 }

package/lib/nitrogen/nitrogen/generated/android/kotlin/com/margelo/nitro/perpdepthbar/views/HybridPerpSideRatioStateUpdater.kt

@@ -14,10 +14,10 @@ internal class HybridPerpSideRatioStateUpdater {
   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: HybridPerpSideRatioSpec, state: StateWrapper)
+    external fun updateViewProps(view: HybridPerpSideRatioSpec, newState: StateWrapper, oldState: StateWrapper?)
   }
 }

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

@@ -37,6 +37,7 @@ using namespace margelo::nitro::perpdepthbar::views;
 
 @implementation HybridPerpDepthBarsComponent {
   std::shared_ptr<HybridPerpDepthBarsSpecSwift> _hybridView;
+  BOOL _didDropView;
 }
 
 + (void) load {
@@ -50,6 +51,7 @@ using namespace margelo::nitro::perpdepthbar::views;
 
 - (instancetype) init {
   if (self = [super init]) {
+    _props = HybridPerpDepthBarsShadowNode::defaultSharedProps();
     std::shared_ptr<HybridPerpDepthBarsSpec> hybridView = PerpDepthBar::PerpDepthBarAutolinking::createPerpDepthBars();
     _hybridView = std::dynamic_pointer_cast<HybridPerpDepthBarsSpecSwift>(hybridView);
     [self updateView];
@@ -69,120 +71,157 @@ using namespace margelo::nitro::perpdepthbar::views;
   [self setContentView:view];
 }
 
+- (void) notifyOnDropView {
+  // A recycled component can later be invalidated. Notify only once per mount.
+  if (_didDropView) {
+    return;
+  }
+  PerpDepthBar::HybridPerpDepthBarsSpec_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<HybridPerpDepthBarsProps const>(props);
-  auto& newViewProps = const_cast<HybridPerpDepthBarsProps&>(newViewPropsConst);
+  const auto& newViewProps = *std::static_pointer_cast<const HybridPerpDepthBarsProps>(props);
+  const auto* oldViewProps = static_cast<const HybridPerpDepthBarsProps*>(oldProps.get());
   PerpDepthBar::HybridPerpDepthBarsSpec_cxx& swiftPart = _hybridView->getSwiftPart();
 
-  // 2. Update each prop individually
-  swiftPart.beforeUpdate();
-
-  // percents: array
-  if (newViewProps.percents.isDirty) {
-    swiftPart.setPercents(newViewProps.percents.value);
-    newViewProps.percents.isDirty = false;
-  }
-  // rowHeight: number
-  if (newViewProps.rowHeight.isDirty) {
-    swiftPart.setRowHeight(newViewProps.rowHeight.value);
-    newViewProps.rowHeight.isDirty = false;
-  }
-  // rowMarginTop: number
-  if (newViewProps.rowMarginTop.isDirty) {
-    swiftPart.setRowMarginTop(newViewProps.rowMarginTop.value);
-    newViewProps.rowMarginTop.isDirty = false;
-  }
-  // barInset: number
-  if (newViewProps.barInset.isDirty) {
-    swiftPart.setBarInset(newViewProps.barInset.value);
-    newViewProps.barInset.isDirty = false;
-  }
-  // color: string
-  if (newViewProps.color.isDirty) {
-    swiftPart.setColor(newViewProps.color.value);
-    newViewProps.color.isDirty = false;
-  }
-  // origin: string
-  if (newViewProps.origin.isDirty) {
-    swiftPart.setOrigin(newViewProps.origin.value);
-    newViewProps.origin.isDirty = false;
-  }
-  // reducedMotion: boolean
-  if (newViewProps.reducedMotion.isDirty) {
-    swiftPart.setReducedMotion(newViewProps.reducedMotion.value);
-    newViewProps.reducedMotion.isDirty = false;
-  }
-  // epoch: number
-  if (newViewProps.epoch.isDirty) {
-    swiftPart.setEpoch(newViewProps.epoch.value);
-    newViewProps.epoch.isDirty = false;
-  }
-  // prices: array
-  if (newViewProps.prices.isDirty) {
-    swiftPart.setPrices(newViewProps.prices.value);
-    newViewProps.prices.isDirty = false;
-  }
-  // sizes: array
-  if (newViewProps.sizes.isDirty) {
-    swiftPart.setSizes(newViewProps.sizes.value);
-    newViewProps.sizes.isDirty = false;
-  }
-  // priceColor: string
-  if (newViewProps.priceColor.isDirty) {
-    swiftPart.setPriceColor(newViewProps.priceColor.value);
-    newViewProps.priceColor.isDirty = false;
-  }
-  // sizeColor: string
-  if (newViewProps.sizeColor.isDirty) {
-    swiftPart.setSizeColor(newViewProps.sizeColor.value);
-    newViewProps.sizeColor.isDirty = false;
-  }
-  // priceFontSize: number
-  if (newViewProps.priceFontSize.isDirty) {
-    swiftPart.setPriceFontSize(newViewProps.priceFontSize.value);
-    newViewProps.priceFontSize.isDirty = false;
-  }
-  // sizeFontSize: number
-  if (newViewProps.sizeFontSize.isDirty) {
-    swiftPart.setSizeFontSize(newViewProps.sizeFontSize.value);
-    newViewProps.sizeFontSize.isDirty = false;
-  }
-  // textInset: number
-  if (newViewProps.textInset.isDirty) {
-    swiftPart.setTextInset(newViewProps.textInset.value);
-    newViewProps.textInset.isDirty = false;
-  }
-  // placeholderText: string
-  if (newViewProps.placeholderText.isDirty) {
-    swiftPart.setPlaceholderText(newViewProps.placeholderText.value);
-    newViewProps.placeholderText.isDirty = false;
-  }
-  // placeholderRows: number
-  if (newViewProps.placeholderRows.isDirty) {
-    swiftPart.setPlaceholderRows(newViewProps.placeholderRows.value);
-    newViewProps.placeholderRows.isDirty = false;
-  }
-  // onRowPress: optional
-  if (newViewProps.onRowPress.isDirty) {
-    swiftPart.setOnRowPress(newViewProps.onRowPress.value);
-    newViewProps.onRowPress.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();
+
+    // percents: array
+    if (oldViewProps == nullptr
+          ? newViewProps.percents.isProvided()
+          : !newViewProps.percents.hasSameValue(oldViewProps->percents)) {
+      swiftPart.setPercents(newViewProps.percents.get());
+    }
+    // rowHeight: number
+    if (oldViewProps == nullptr
+          ? newViewProps.rowHeight.isProvided()
+          : !newViewProps.rowHeight.hasSameValue(oldViewProps->rowHeight)) {
+      swiftPart.setRowHeight(newViewProps.rowHeight.get());
+    }
+    // rowMarginTop: number
+    if (oldViewProps == nullptr
+          ? newViewProps.rowMarginTop.isProvided()
+          : !newViewProps.rowMarginTop.hasSameValue(oldViewProps->rowMarginTop)) {
+      swiftPart.setRowMarginTop(newViewProps.rowMarginTop.get());
+    }
+    // barInset: number
+    if (oldViewProps == nullptr
+          ? newViewProps.barInset.isProvided()
+          : !newViewProps.barInset.hasSameValue(oldViewProps->barInset)) {
+      swiftPart.setBarInset(newViewProps.barInset.get());
+    }
+    // color: string
+    if (oldViewProps == nullptr
+          ? newViewProps.color.isProvided()
+          : !newViewProps.color.hasSameValue(oldViewProps->color)) {
+      swiftPart.setColor(newViewProps.color.get());
+    }
+    // origin: string
+    if (oldViewProps == nullptr
+          ? newViewProps.origin.isProvided()
+          : !newViewProps.origin.hasSameValue(oldViewProps->origin)) {
+      swiftPart.setOrigin(newViewProps.origin.get());
+    }
+    // reducedMotion: boolean
+    if (oldViewProps == nullptr
+          ? newViewProps.reducedMotion.isProvided()
+          : !newViewProps.reducedMotion.hasSameValue(oldViewProps->reducedMotion)) {
+      swiftPart.setReducedMotion(newViewProps.reducedMotion.get());
+    }
+    // epoch: number
+    if (oldViewProps == nullptr
+          ? newViewProps.epoch.isProvided()
+          : !newViewProps.epoch.hasSameValue(oldViewProps->epoch)) {
+      swiftPart.setEpoch(newViewProps.epoch.get());
+    }
+    // prices: array
+    if (oldViewProps == nullptr
+          ? newViewProps.prices.isProvided()
+          : !newViewProps.prices.hasSameValue(oldViewProps->prices)) {
+      swiftPart.setPrices(newViewProps.prices.get());
+    }
+    // sizes: array
+    if (oldViewProps == nullptr
+          ? newViewProps.sizes.isProvided()
+          : !newViewProps.sizes.hasSameValue(oldViewProps->sizes)) {
+      swiftPart.setSizes(newViewProps.sizes.get());
+    }
+    // priceColor: string
+    if (oldViewProps == nullptr
+          ? newViewProps.priceColor.isProvided()
+          : !newViewProps.priceColor.hasSameValue(oldViewProps->priceColor)) {
+      swiftPart.setPriceColor(newViewProps.priceColor.get());
+    }
+    // sizeColor: string
+    if (oldViewProps == nullptr
+          ? newViewProps.sizeColor.isProvided()
+          : !newViewProps.sizeColor.hasSameValue(oldViewProps->sizeColor)) {
+      swiftPart.setSizeColor(newViewProps.sizeColor.get());
+    }
+    // priceFontSize: number
+    if (oldViewProps == nullptr
+          ? newViewProps.priceFontSize.isProvided()
+          : !newViewProps.priceFontSize.hasSameValue(oldViewProps->priceFontSize)) {
+      swiftPart.setPriceFontSize(newViewProps.priceFontSize.get());
+    }
+    // sizeFontSize: number
+    if (oldViewProps == nullptr
+          ? newViewProps.sizeFontSize.isProvided()
+          : !newViewProps.sizeFontSize.hasSameValue(oldViewProps->sizeFontSize)) {
+      swiftPart.setSizeFontSize(newViewProps.sizeFontSize.get());
+    }
+    // textInset: number
+    if (oldViewProps == nullptr
+          ? newViewProps.textInset.isProvided()
+          : !newViewProps.textInset.hasSameValue(oldViewProps->textInset)) {
+      swiftPart.setTextInset(newViewProps.textInset.get());
+    }
+    // placeholderText: string
+    if (oldViewProps == nullptr
+          ? newViewProps.placeholderText.isProvided()
+          : !newViewProps.placeholderText.hasSameValue(oldViewProps->placeholderText)) {
+      swiftPart.setPlaceholderText(newViewProps.placeholderText.get());
+    }
+    // placeholderRows: number
+    if (oldViewProps == nullptr
+          ? newViewProps.placeholderRows.isProvided()
+          : !newViewProps.placeholderRows.hasSameValue(oldViewProps->placeholderRows)) {
+      swiftPart.setPlaceholderRows(newViewProps.placeholderRows.get());
+    }
+    // onRowPress: optional
+    if (oldViewProps == nullptr
+          ? newViewProps.onRowPress.isProvided()
+          : !newViewProps.onRowPress.hasSameValue(oldViewProps->onRowPress)) {
+      swiftPart.setOnRowPress(newViewProps.onRowPress.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];
 }
 
@@ -191,6 +230,7 @@ using namespace margelo::nitro::perpdepthbar::views;
 }
 
 - (void)prepareForRecycle {
+  [self notifyOnDropView];
   [super prepareForRecycle];
   PerpDepthBar::HybridPerpDepthBarsSpec_cxx& swiftPart = _hybridView->getSwiftPart();
   swiftPart.maybePrepareForRecycle();
@@ -198,8 +238,7 @@ using namespace margelo::nitro::perpdepthbar::views;
 
 #ifdef ENABLE_RCT_COMPONENT_VIEW_INVALIDATE
 - (void)invalidate {
-  PerpDepthBar::HybridPerpDepthBarsSpec_cxx& swiftPart = _hybridView->getSwiftPart();
-  swiftPart.onDropView();
+  [self notifyOnDropView];
   [super invalidate];
 }
 #endif

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

@@ -37,6 +37,7 @@ using namespace margelo::nitro::perpdepthbar::views;
 
 @implementation HybridPerpSideRatioComponent {
   std::shared_ptr<HybridPerpSideRatioSpecSwift> _hybridView;
+  BOOL _didDropView;
 }
 
 + (void) load {
@@ -50,6 +51,7 @@ using namespace margelo::nitro::perpdepthbar::views;
 
 - (instancetype) init {
   if (self = [super init]) {
+    _props = HybridPerpSideRatioShadowNode::defaultSharedProps();
     std::shared_ptr<HybridPerpSideRatioSpec> hybridView = PerpDepthBar::PerpDepthBarAutolinking::createPerpSideRatio();
     _hybridView = std::dynamic_pointer_cast<HybridPerpSideRatioSpecSwift>(hybridView);
     [self updateView];
@@ -69,70 +71,97 @@ using namespace margelo::nitro::perpdepthbar::views;
   [self setContentView:view];
 }
 
+- (void) notifyOnDropView {
+  // A recycled component can later be invalidated. Notify only once per mount.
+  if (_didDropView) {
+    return;
+  }
+  PerpDepthBar::HybridPerpSideRatioSpec_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<HybridPerpSideRatioProps const>(props);
-  auto& newViewProps = const_cast<HybridPerpSideRatioProps&>(newViewPropsConst);
+  const auto& newViewProps = *std::static_pointer_cast<const HybridPerpSideRatioProps>(props);
+  const auto* oldViewProps = static_cast<const HybridPerpSideRatioProps*>(oldProps.get());
   PerpDepthBar::HybridPerpSideRatioSpec_cxx& swiftPart = _hybridView->getSwiftPart();
 
-  // 2. Update each prop individually
-  swiftPart.beforeUpdate();
-
-  // bidPercentage: number
-  if (newViewProps.bidPercentage.isDirty) {
-    swiftPart.setBidPercentage(newViewProps.bidPercentage.value);
-    newViewProps.bidPercentage.isDirty = false;
-  }
-  // askPercentage: number
-  if (newViewProps.askPercentage.isDirty) {
-    swiftPart.setAskPercentage(newViewProps.askPercentage.value);
-    newViewProps.askPercentage.isDirty = false;
-  }
-  // longColor: string
-  if (newViewProps.longColor.isDirty) {
-    swiftPart.setLongColor(newViewProps.longColor.value);
-    newViewProps.longColor.isDirty = false;
-  }
-  // shortColor: string
-  if (newViewProps.shortColor.isDirty) {
-    swiftPart.setShortColor(newViewProps.shortColor.value);
-    newViewProps.shortColor.isDirty = false;
-  }
-  // segmentHeight: number
-  if (newViewProps.segmentHeight.isDirty) {
-    swiftPart.setSegmentHeight(newViewProps.segmentHeight.value);
-    newViewProps.segmentHeight.isDirty = false;
-  }
-  // cornerRadius: number
-  if (newViewProps.cornerRadius.isDirty) {
-    swiftPart.setCornerRadius(newViewProps.cornerRadius.value);
-    newViewProps.cornerRadius.isDirty = false;
-  }
-  // gap: number
-  if (newViewProps.gap.isDirty) {
-    swiftPart.setGap(newViewProps.gap.value);
-    newViewProps.gap.isDirty = false;
-  }
-  // reducedMotion: boolean
-  if (newViewProps.reducedMotion.isDirty) {
-    swiftPart.setReducedMotion(newViewProps.reducedMotion.value);
-    newViewProps.reducedMotion.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();
+
+    // bidPercentage: number
+    if (oldViewProps == nullptr
+          ? newViewProps.bidPercentage.isProvided()
+          : !newViewProps.bidPercentage.hasSameValue(oldViewProps->bidPercentage)) {
+      swiftPart.setBidPercentage(newViewProps.bidPercentage.get());
+    }
+    // askPercentage: number
+    if (oldViewProps == nullptr
+          ? newViewProps.askPercentage.isProvided()
+          : !newViewProps.askPercentage.hasSameValue(oldViewProps->askPercentage)) {
+      swiftPart.setAskPercentage(newViewProps.askPercentage.get());
+    }
+    // longColor: string
+    if (oldViewProps == nullptr
+          ? newViewProps.longColor.isProvided()
+          : !newViewProps.longColor.hasSameValue(oldViewProps->longColor)) {
+      swiftPart.setLongColor(newViewProps.longColor.get());
+    }
+    // shortColor: string
+    if (oldViewProps == nullptr
+          ? newViewProps.shortColor.isProvided()
+          : !newViewProps.shortColor.hasSameValue(oldViewProps->shortColor)) {
+      swiftPart.setShortColor(newViewProps.shortColor.get());
+    }
+    // segmentHeight: number
+    if (oldViewProps == nullptr
+          ? newViewProps.segmentHeight.isProvided()
+          : !newViewProps.segmentHeight.hasSameValue(oldViewProps->segmentHeight)) {
+      swiftPart.setSegmentHeight(newViewProps.segmentHeight.get());
+    }
+    // cornerRadius: number
+    if (oldViewProps == nullptr
+          ? newViewProps.cornerRadius.isProvided()
+          : !newViewProps.cornerRadius.hasSameValue(oldViewProps->cornerRadius)) {
+      swiftPart.setCornerRadius(newViewProps.cornerRadius.get());
+    }
+    // gap: number
+    if (oldViewProps == nullptr
+          ? newViewProps.gap.isProvided()
+          : !newViewProps.gap.hasSameValue(oldViewProps->gap)) {
+      swiftPart.setGap(newViewProps.gap.get());
+    }
+    // reducedMotion: boolean
+    if (oldViewProps == nullptr
+          ? newViewProps.reducedMotion.isProvided()
+          : !newViewProps.reducedMotion.hasSameValue(oldViewProps->reducedMotion)) {
+      swiftPart.setReducedMotion(newViewProps.reducedMotion.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];
 }
 
@@ -141,6 +170,7 @@ using namespace margelo::nitro::perpdepthbar::views;
 }
 
 - (void)prepareForRecycle {
+  [self notifyOnDropView];
   [super prepareForRecycle];
   PerpDepthBar::HybridPerpSideRatioSpec_cxx& swiftPart = _hybridView->getSwiftPart();
   swiftPart.maybePrepareForRecycle();
@@ -148,8 +178,7 @@ using namespace margelo::nitro::perpdepthbar::views;
 
 #ifdef ENABLE_RCT_COMPONENT_VIEW_INVALIDATE
 - (void)invalidate {
-  PerpDepthBar::HybridPerpSideRatioSpec_cxx& swiftPart = _hybridView->getSwiftPart();
-  swiftPart.onDropView();
+  [self notifyOnDropView];
   [super invalidate];
 }
 #endif