@onekeyfe/react-native-chart-webview 3.0.96 → 3.0.98

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

@@ -15,89 +15,119 @@ namespace margelo::nitro::chartwebview::views {
 using namespace facebook;
 using ConcreteStateData = react::ConcreteState<HybridChartWebviewState>;
 
-void JHybridChartWebviewStateUpdater::updateViewProps(jni::alias_ref<jni::JClass> /* class */,
-                                           jni::alias_ref<JHybridChartWebviewSpec::JavaPart> javaView,
-                                           jni::alias_ref<JStateWrapper::javaobject> stateWrapperInterface) {
-  std::shared_ptr<JHybridChartWebviewSpec> hybridView = javaView->getJHybridChartWebviewSpec();
-
+std::shared_ptr<const HybridChartWebviewProps> JHybridChartWebviewStateUpdater::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 HybridChartWebviewState& data = concreteState->getData();
-  const std::shared_ptr<HybridChartWebviewProps>& props = data.getProps();
+  const std::shared_ptr<const HybridChartWebviewProps>& props = data.getProps();
   if (props == nullptr) [[unlikely]] {
-    // Props aren't set yet!
     throw std::runtime_error("HybridChartWebviewState's data doesn't contain any props!");
   }
+  return props;
+}
 
-  // Update all props if they are dirty
-  if (props->uri.isDirty) {
-    hybridView->setUri(props->uri.value);
-    props->uri.isDirty = false;
-  }
-  if (props->localBundle.isDirty) {
-    hybridView->setLocalBundle(props->localBundle.value);
-    props->localBundle.isDirty = false;
-  }
-  if (props->entry.isDirty) {
-    hybridView->setEntry(props->entry.value);
-    props->entry.isDirty = false;
-  }
-  if (props->paramsJson.isDirty) {
-    hybridView->setParamsJson(props->paramsJson.value);
-    props->paramsJson.isDirty = false;
-  }
-  if (props->assetHost.isDirty) {
-    hybridView->setAssetHost(props->assetHost.value);
-    props->assetHost.isDirty = false;
-  }
-  if (props->bridgeScript.isDirty) {
-    hybridView->setBridgeScript(props->bridgeScript.value);
-    props->bridgeScript.isDirty = false;
-  }
-  if (props->reuseKey.isDirty) {
-    hybridView->setReuseKey(props->reuseKey.value);
-    props->reuseKey.isDirty = false;
-  }
-  if (props->pooled.isDirty) {
-    hybridView->setPooled(props->pooled.value);
-    props->pooled.isDirty = false;
-  }
-  if (props->active.isDirty) {
-    hybridView->setActive(props->active.value);
-    props->active.isDirty = false;
-  }
-  if (props->webviewDebuggingEnabled.isDirty) {
-    hybridView->setWebviewDebuggingEnabled(props->webviewDebuggingEnabled.value);
-    props->webviewDebuggingEnabled.isDirty = false;
-  }
-  if (props->onMessage.isDirty) {
-    hybridView->setOnMessage(props->onMessage.value);
-    props->onMessage.isDirty = false;
-  }
-  if (props->onLoadEnd.isDirty) {
-    hybridView->setOnLoadEnd(props->onLoadEnd.value);
-    props->onLoadEnd.isDirty = false;
+void JHybridChartWebviewStateUpdater::updateViewProps(jni::alias_ref<jni::JClass> /* class */,
+                                           jni::alias_ref<JHybridChartWebviewSpec::JavaPart> javaView,
+                                           jni::alias_ref<JStateWrapper::javaobject> newState,
+                                           jni::alias_ref<JStateWrapper::javaobject> oldState) {
+  std::shared_ptr<JHybridChartWebviewSpec> hybridView = javaView->getJHybridChartWebviewSpec();
+  std::shared_ptr<const HybridChartWebviewProps> newProps = getPropsFromStateWrapper(newState);
+  std::shared_ptr<const HybridChartWebviewProps> oldProps = getPropsFromStateWrapper(oldState);
+  if (newProps == nullptr) [[unlikely]] {
+    throw std::runtime_error("Current StateWrapper doesn't contain any props!");
   }
-  if (props->onError.isDirty) {
-    hybridView->setOnError(props->onError.value);
-    props->onError.isDirty = false;
+
+  // Update only props that differ from the previous State snapshot.
+  if (oldProps == nullptr
+        ? newProps->uri.isProvided()
+        : !newProps->uri.hasSameValue(oldProps->uri)) {
+    hybridView->setUri(newProps->uri.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->localBundle.isProvided()
+        : !newProps->localBundle.hasSameValue(oldProps->localBundle)) {
+    hybridView->setLocalBundle(newProps->localBundle.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->entry.isProvided()
+        : !newProps->entry.hasSameValue(oldProps->entry)) {
+    hybridView->setEntry(newProps->entry.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->paramsJson.isProvided()
+        : !newProps->paramsJson.hasSameValue(oldProps->paramsJson)) {
+    hybridView->setParamsJson(newProps->paramsJson.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->assetHost.isProvided()
+        : !newProps->assetHost.hasSameValue(oldProps->assetHost)) {
+    hybridView->setAssetHost(newProps->assetHost.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->bridgeScript.isProvided()
+        : !newProps->bridgeScript.hasSameValue(oldProps->bridgeScript)) {
+    hybridView->setBridgeScript(newProps->bridgeScript.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->reuseKey.isProvided()
+        : !newProps->reuseKey.hasSameValue(oldProps->reuseKey)) {
+    hybridView->setReuseKey(newProps->reuseKey.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->pooled.isProvided()
+        : !newProps->pooled.hasSameValue(oldProps->pooled)) {
+    hybridView->setPooled(newProps->pooled.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->active.isProvided()
+        : !newProps->active.hasSameValue(oldProps->active)) {
+    hybridView->setActive(newProps->active.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->webviewDebuggingEnabled.isProvided()
+        : !newProps->webviewDebuggingEnabled.hasSameValue(oldProps->webviewDebuggingEnabled)) {
+    hybridView->setWebviewDebuggingEnabled(newProps->webviewDebuggingEnabled.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->onMessage.isProvided()
+        : !newProps->onMessage.hasSameValue(oldProps->onMessage)) {
+    hybridView->setOnMessage(newProps->onMessage.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->onLoadEnd.isProvided()
+        : !newProps->onLoadEnd.hasSameValue(oldProps->onLoadEnd)) {
+    hybridView->setOnLoadEnd(newProps->onLoadEnd.get());
+  }
+  if (oldProps == nullptr
+        ? newProps->onError.isProvided()
+        : !newProps->onError.hasSameValue(oldProps->onError)) {
+    hybridView->setOnError(newProps->onError.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/lib/nitrogen/generated/android/c++/views/JHybridChartWebviewStateUpdater.hpp

@@ -31,7 +31,12 @@ public:
 public:
   static void updateViewProps(jni::alias_ref<jni::JClass> /* class */,
                               jni::alias_ref<JHybridChartWebviewSpec::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 HybridChartWebviewProps> getPropsFromStateWrapper(
+      jni::alias_ref<JStateWrapper::javaobject> stateWrapper);
 
 public:
   static void registerNatives() {

package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/views/HybridChartWebviewManager.kt

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

package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/views/HybridChartWebviewStateUpdater.kt

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

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

@@ -37,6 +37,7 @@ using namespace margelo::nitro::chartwebview::views;
 
 @implementation HybridChartWebviewComponent {
   std::shared_ptr<HybridChartWebviewSpecSwift> _hybridView;
+  BOOL _didDropView;
 }
 
 + (void) load {
@@ -50,6 +51,7 @@ using namespace margelo::nitro::chartwebview::views;
 
 - (instancetype) init {
   if (self = [super init]) {
+    _props = HybridChartWebviewShadowNode::defaultSharedProps();
     std::shared_ptr<HybridChartWebviewSpec> hybridView = ChartWebview::ChartWebviewAutolinking::createChartWebview();
     _hybridView = std::dynamic_pointer_cast<HybridChartWebviewSpecSwift>(hybridView);
     [self updateView];
@@ -69,95 +71,127 @@ using namespace margelo::nitro::chartwebview::views;
   [self setContentView:view];
 }
 
+- (void) notifyOnDropView {
+  // A recycled component can later be invalidated. Notify only once per mount.
+  if (_didDropView) {
+    return;
+  }
+  ChartWebview::HybridChartWebviewSpec_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<HybridChartWebviewProps const>(props);
-  auto& newViewProps = const_cast<HybridChartWebviewProps&>(newViewPropsConst);
+  const auto& newViewProps = *std::static_pointer_cast<const HybridChartWebviewProps>(props);
+  const auto* oldViewProps = static_cast<const HybridChartWebviewProps*>(oldProps.get());
   ChartWebview::HybridChartWebviewSpec_cxx& swiftPart = _hybridView->getSwiftPart();
 
-  // 2. Update each prop individually
-  swiftPart.beforeUpdate();
-
-  // uri: optional
-  if (newViewProps.uri.isDirty) {
-    swiftPart.setUri(newViewProps.uri.value);
-    newViewProps.uri.isDirty = false;
-  }
-  // localBundle: optional
-  if (newViewProps.localBundle.isDirty) {
-    swiftPart.setLocalBundle(newViewProps.localBundle.value);
-    newViewProps.localBundle.isDirty = false;
-  }
-  // entry: optional
-  if (newViewProps.entry.isDirty) {
-    swiftPart.setEntry(newViewProps.entry.value);
-    newViewProps.entry.isDirty = false;
-  }
-  // paramsJson: optional
-  if (newViewProps.paramsJson.isDirty) {
-    swiftPart.setParamsJson(newViewProps.paramsJson.value);
-    newViewProps.paramsJson.isDirty = false;
-  }
-  // assetHost: optional
-  if (newViewProps.assetHost.isDirty) {
-    swiftPart.setAssetHost(newViewProps.assetHost.value);
-    newViewProps.assetHost.isDirty = false;
-  }
-  // bridgeScript: optional
-  if (newViewProps.bridgeScript.isDirty) {
-    swiftPart.setBridgeScript(newViewProps.bridgeScript.value);
-    newViewProps.bridgeScript.isDirty = false;
-  }
-  // reuseKey: optional
-  if (newViewProps.reuseKey.isDirty) {
-    swiftPart.setReuseKey(newViewProps.reuseKey.value);
-    newViewProps.reuseKey.isDirty = false;
-  }
-  // pooled: optional
-  if (newViewProps.pooled.isDirty) {
-    swiftPart.setPooled(newViewProps.pooled.value);
-    newViewProps.pooled.isDirty = false;
-  }
-  // active: optional
-  if (newViewProps.active.isDirty) {
-    swiftPart.setActive(newViewProps.active.value);
-    newViewProps.active.isDirty = false;
-  }
-  // webviewDebuggingEnabled: optional
-  if (newViewProps.webviewDebuggingEnabled.isDirty) {
-    swiftPart.setWebviewDebuggingEnabled(newViewProps.webviewDebuggingEnabled.value);
-    newViewProps.webviewDebuggingEnabled.isDirty = false;
-  }
-  // onMessage: optional
-  if (newViewProps.onMessage.isDirty) {
-    swiftPart.setOnMessage(newViewProps.onMessage.value);
-    newViewProps.onMessage.isDirty = false;
-  }
-  // onLoadEnd: optional
-  if (newViewProps.onLoadEnd.isDirty) {
-    swiftPart.setOnLoadEnd(newViewProps.onLoadEnd.value);
-    newViewProps.onLoadEnd.isDirty = false;
-  }
-  // onError: optional
-  if (newViewProps.onError.isDirty) {
-    swiftPart.setOnError(newViewProps.onError.value);
-    newViewProps.onError.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();
+
+    // uri: optional
+    if (oldViewProps == nullptr
+          ? newViewProps.uri.isProvided()
+          : !newViewProps.uri.hasSameValue(oldViewProps->uri)) {
+      swiftPart.setUri(newViewProps.uri.get());
+    }
+    // localBundle: optional
+    if (oldViewProps == nullptr
+          ? newViewProps.localBundle.isProvided()
+          : !newViewProps.localBundle.hasSameValue(oldViewProps->localBundle)) {
+      swiftPart.setLocalBundle(newViewProps.localBundle.get());
+    }
+    // entry: optional
+    if (oldViewProps == nullptr
+          ? newViewProps.entry.isProvided()
+          : !newViewProps.entry.hasSameValue(oldViewProps->entry)) {
+      swiftPart.setEntry(newViewProps.entry.get());
+    }
+    // paramsJson: optional
+    if (oldViewProps == nullptr
+          ? newViewProps.paramsJson.isProvided()
+          : !newViewProps.paramsJson.hasSameValue(oldViewProps->paramsJson)) {
+      swiftPart.setParamsJson(newViewProps.paramsJson.get());
+    }
+    // assetHost: optional
+    if (oldViewProps == nullptr
+          ? newViewProps.assetHost.isProvided()
+          : !newViewProps.assetHost.hasSameValue(oldViewProps->assetHost)) {
+      swiftPart.setAssetHost(newViewProps.assetHost.get());
+    }
+    // bridgeScript: optional
+    if (oldViewProps == nullptr
+          ? newViewProps.bridgeScript.isProvided()
+          : !newViewProps.bridgeScript.hasSameValue(oldViewProps->bridgeScript)) {
+      swiftPart.setBridgeScript(newViewProps.bridgeScript.get());
+    }
+    // reuseKey: optional
+    if (oldViewProps == nullptr
+          ? newViewProps.reuseKey.isProvided()
+          : !newViewProps.reuseKey.hasSameValue(oldViewProps->reuseKey)) {
+      swiftPart.setReuseKey(newViewProps.reuseKey.get());
+    }
+    // pooled: optional
+    if (oldViewProps == nullptr
+          ? newViewProps.pooled.isProvided()
+          : !newViewProps.pooled.hasSameValue(oldViewProps->pooled)) {
+      swiftPart.setPooled(newViewProps.pooled.get());
+    }
+    // active: optional
+    if (oldViewProps == nullptr
+          ? newViewProps.active.isProvided()
+          : !newViewProps.active.hasSameValue(oldViewProps->active)) {
+      swiftPart.setActive(newViewProps.active.get());
+    }
+    // webviewDebuggingEnabled: optional
+    if (oldViewProps == nullptr
+          ? newViewProps.webviewDebuggingEnabled.isProvided()
+          : !newViewProps.webviewDebuggingEnabled.hasSameValue(oldViewProps->webviewDebuggingEnabled)) {
+      swiftPart.setWebviewDebuggingEnabled(newViewProps.webviewDebuggingEnabled.get());
+    }
+    // onMessage: optional
+    if (oldViewProps == nullptr
+          ? newViewProps.onMessage.isProvided()
+          : !newViewProps.onMessage.hasSameValue(oldViewProps->onMessage)) {
+      swiftPart.setOnMessage(newViewProps.onMessage.get());
+    }
+    // onLoadEnd: optional
+    if (oldViewProps == nullptr
+          ? newViewProps.onLoadEnd.isProvided()
+          : !newViewProps.onLoadEnd.hasSameValue(oldViewProps->onLoadEnd)) {
+      swiftPart.setOnLoadEnd(newViewProps.onLoadEnd.get());
+    }
+    // onError: optional
+    if (oldViewProps == nullptr
+          ? newViewProps.onError.isProvided()
+          : !newViewProps.onError.hasSameValue(oldViewProps->onError)) {
+      swiftPart.setOnError(newViewProps.onError.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];
 }
 
@@ -166,6 +200,7 @@ using namespace margelo::nitro::chartwebview::views;
 }
 
 - (void)prepareForRecycle {
+  [self notifyOnDropView];
   [super prepareForRecycle];
   ChartWebview::HybridChartWebviewSpec_cxx& swiftPart = _hybridView->getSwiftPart();
   swiftPart.maybePrepareForRecycle();
@@ -173,8 +208,7 @@ using namespace margelo::nitro::chartwebview::views;
 
 #ifdef ENABLE_RCT_COMPONENT_VIEW_INVALIDATE
 - (void)invalidate {
-  ChartWebview::HybridChartWebviewSpec_cxx& swiftPart = _hybridView->getSwiftPart();
-  swiftPart.onDropView();
+  [self notifyOnDropView];
   [super invalidate];
 }
 #endif