@whetware/react-native-stroke-text 0.0.11 → 0.0.13

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

@@ -8,6 +8,7 @@
 #include "JHybridStrokeTextViewStateUpdater.hpp"
 #include "views/HybridStrokeTextViewComponent.hpp"
 #include <NitroModules/NitroDefines.hpp>
+#include <react/fabric/StateWrapperImpl.h>
 
 namespace margelo::nitro::stroketext::views {
 
@@ -15,145 +16,144 @@ using namespace facebook;
 using ConcreteStateData = react::ConcreteState<HybridStrokeTextViewState>;
 
 void JHybridStrokeTextViewStateUpdater::updateViewProps(jni::alias_ref<jni::JClass> /* class */,
-                                           jni::alias_ref<JHybridStrokeTextViewSpec::javaobject> javaView,
+                                           jni::alias_ref<JHybridStrokeTextViewSpec::JavaPart> javaView,
                                            jni::alias_ref<JStateWrapper::javaobject> stateWrapperInterface) {
-  JHybridStrokeTextViewSpec* view = javaView->cthis();
+  std::shared_ptr<JHybridStrokeTextViewSpec> hybridView = javaView->getJHybridStrokeTextViewSpec();
 
   // 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 HybridStrokeTextViewState& data = concreteState->getData();
-  const std::optional<HybridStrokeTextViewProps>& maybeProps = data.getProps();
-  if (!maybeProps.has_value()) {
+  const std::shared_ptr<HybridStrokeTextViewProps>& props = data.getProps();
+  if (props == nullptr) [[unlikely]] {
     // Props aren't set yet!
     throw std::runtime_error("HybridStrokeTextViewState's data doesn't contain any props!");
   }
-  const HybridStrokeTextViewProps& props = maybeProps.value();
-  if (props.text.isDirty) {
-    view->setText(props.text.value);
-    // TODO: Set isDirty = false
+
+  // Update all props if they are dirty
+  if (props->text.isDirty) {
+    hybridView->setText(props->text.value);
+    props->text.isDirty = false;
   }
-  if (props.color.isDirty) {
-    view->setColor(props.color.value);
-    // TODO: Set isDirty = false
+  if (props->color.isDirty) {
+    hybridView->setColor(props->color.value);
+    props->color.isDirty = false;
   }
-  if (props.strokeColor.isDirty) {
-    view->setStrokeColor(props.strokeColor.value);
-    // TODO: Set isDirty = false
+  if (props->strokeColor.isDirty) {
+    hybridView->setStrokeColor(props->strokeColor.value);
+    props->strokeColor.isDirty = false;
   }
-  if (props.strokeWidth.isDirty) {
-    view->setStrokeWidth(props.strokeWidth.value);
-    // TODO: Set isDirty = false
+  if (props->strokeWidth.isDirty) {
+    hybridView->setStrokeWidth(props->strokeWidth.value);
+    props->strokeWidth.isDirty = false;
   }
-  if (props.fontSize.isDirty) {
-    view->setFontSize(props.fontSize.value);
-    // TODO: Set isDirty = false
+  if (props->fontSize.isDirty) {
+    hybridView->setFontSize(props->fontSize.value);
+    props->fontSize.isDirty = false;
   }
-  if (props.fontWeight.isDirty) {
-    view->setFontWeight(props.fontWeight.value);
-    // TODO: Set isDirty = false
+  if (props->fontWeight.isDirty) {
+    hybridView->setFontWeight(props->fontWeight.value);
+    props->fontWeight.isDirty = false;
   }
-  if (props.fontFamily.isDirty) {
-    view->setFontFamily(props.fontFamily.value);
-    // TODO: Set isDirty = false
+  if (props->fontFamily.isDirty) {
+    hybridView->setFontFamily(props->fontFamily.value);
+    props->fontFamily.isDirty = false;
   }
-  if (props.fontStyle.isDirty) {
-    view->setFontStyle(props.fontStyle.value);
-    // TODO: Set isDirty = false
+  if (props->fontStyle.isDirty) {
+    hybridView->setFontStyle(props->fontStyle.value);
+    props->fontStyle.isDirty = false;
   }
-  if (props.lineHeight.isDirty) {
-    view->setLineHeight(props.lineHeight.value);
-    // TODO: Set isDirty = false
+  if (props->lineHeight.isDirty) {
+    hybridView->setLineHeight(props->lineHeight.value);
+    props->lineHeight.isDirty = false;
   }
-  if (props.letterSpacing.isDirty) {
-    view->setLetterSpacing(props.letterSpacing.value);
-    // TODO: Set isDirty = false
+  if (props->letterSpacing.isDirty) {
+    hybridView->setLetterSpacing(props->letterSpacing.value);
+    props->letterSpacing.isDirty = false;
   }
-  if (props.textAlign.isDirty) {
-    view->setTextAlign(props.textAlign.value);
-    // TODO: Set isDirty = false
+  if (props->textAlign.isDirty) {
+    hybridView->setTextAlign(props->textAlign.value);
+    props->textAlign.isDirty = false;
   }
-  if (props.textAlignVertical.isDirty) {
-    view->setTextAlignVertical(props.textAlignVertical.value);
-    // TODO: Set isDirty = false
+  if (props->textAlignVertical.isDirty) {
+    hybridView->setTextAlignVertical(props->textAlignVertical.value);
+    props->textAlignVertical.isDirty = false;
   }
-  if (props.textDecorationLine.isDirty) {
-    view->setTextDecorationLine(props.textDecorationLine.value);
-    // TODO: Set isDirty = false
+  if (props->textDecorationLine.isDirty) {
+    hybridView->setTextDecorationLine(props->textDecorationLine.value);
+    props->textDecorationLine.isDirty = false;
   }
-  if (props.textTransform.isDirty) {
-    view->setTextTransform(props.textTransform.value);
-    // TODO: Set isDirty = false
+  if (props->textTransform.isDirty) {
+    hybridView->setTextTransform(props->textTransform.value);
+    props->textTransform.isDirty = false;
   }
-  if (props.opacity.isDirty) {
-    view->setOpacity(props.opacity.value);
-    // TODO: Set isDirty = false
+  if (props->opacity.isDirty) {
+    hybridView->setOpacity(props->opacity.value);
+    props->opacity.isDirty = false;
   }
-  if (props.allowFontScaling.isDirty) {
-    view->setAllowFontScaling(props.allowFontScaling.value);
-    // TODO: Set isDirty = false
+  if (props->allowFontScaling.isDirty) {
+    hybridView->setAllowFontScaling(props->allowFontScaling.value);
+    props->allowFontScaling.isDirty = false;
   }
-  if (props.maxFontSizeMultiplier.isDirty) {
-    view->setMaxFontSizeMultiplier(props.maxFontSizeMultiplier.value);
-    // TODO: Set isDirty = false
+  if (props->maxFontSizeMultiplier.isDirty) {
+    hybridView->setMaxFontSizeMultiplier(props->maxFontSizeMultiplier.value);
+    props->maxFontSizeMultiplier.isDirty = false;
   }
-  if (props.includeFontPadding.isDirty) {
-    view->setIncludeFontPadding(props.includeFontPadding.value);
-    // TODO: Set isDirty = false
+  if (props->includeFontPadding.isDirty) {
+    hybridView->setIncludeFontPadding(props->includeFontPadding.value);
+    props->includeFontPadding.isDirty = false;
   }
-  if (props.numberOfLines.isDirty) {
-    view->setNumberOfLines(props.numberOfLines.value);
-    // TODO: Set isDirty = false
+  if (props->numberOfLines.isDirty) {
+    hybridView->setNumberOfLines(props->numberOfLines.value);
+    props->numberOfLines.isDirty = false;
   }
-  if (props.ellipsizeMode.isDirty) {
-    view->setEllipsizeMode(props.ellipsizeMode.value);
-    // TODO: Set isDirty = false
+  if (props->ellipsizeMode.isDirty) {
+    hybridView->setEllipsizeMode(props->ellipsizeMode.value);
+    props->ellipsizeMode.isDirty = false;
   }
-  if (props.padding.isDirty) {
-    view->setPadding(props.padding.value);
-    // TODO: Set isDirty = false
+  if (props->padding.isDirty) {
+    hybridView->setPadding(props->padding.value);
+    props->padding.isDirty = false;
   }
-  if (props.paddingVertical.isDirty) {
-    view->setPaddingVertical(props.paddingVertical.value);
-    // TODO: Set isDirty = false
+  if (props->paddingVertical.isDirty) {
+    hybridView->setPaddingVertical(props->paddingVertical.value);
+    props->paddingVertical.isDirty = false;
   }
-  if (props.paddingHorizontal.isDirty) {
-    view->setPaddingHorizontal(props.paddingHorizontal.value);
-    // TODO: Set isDirty = false
+  if (props->paddingHorizontal.isDirty) {
+    hybridView->setPaddingHorizontal(props->paddingHorizontal.value);
+    props->paddingHorizontal.isDirty = false;
   }
-  if (props.paddingTop.isDirty) {
-    view->setPaddingTop(props.paddingTop.value);
-    // TODO: Set isDirty = false
+  if (props->paddingTop.isDirty) {
+    hybridView->setPaddingTop(props->paddingTop.value);
+    props->paddingTop.isDirty = false;
   }
-  if (props.paddingRight.isDirty) {
-    view->setPaddingRight(props.paddingRight.value);
-    // TODO: Set isDirty = false
+  if (props->paddingRight.isDirty) {
+    hybridView->setPaddingRight(props->paddingRight.value);
+    props->paddingRight.isDirty = false;
   }
-  if (props.paddingBottom.isDirty) {
-    view->setPaddingBottom(props.paddingBottom.value);
-    // TODO: Set isDirty = false
+  if (props->paddingBottom.isDirty) {
+    hybridView->setPaddingBottom(props->paddingBottom.value);
+    props->paddingBottom.isDirty = false;
   }
-  if (props.paddingLeft.isDirty) {
-    view->setPaddingLeft(props.paddingLeft.value);
-    // TODO: Set isDirty = false
+  if (props->paddingLeft.isDirty) {
+    hybridView->setPaddingLeft(props->paddingLeft.value);
+    props->paddingLeft.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<JHybridStrokeTextViewSpec> shared = javaView->cthis()->shared_cast<JHybridStrokeTextViewSpec>();
-      maybeFunc.value()(shared);
+      maybeFunc.value()(hybridView);
     }
-    // TODO: Set isDirty = false
+    props->hybridRef.isDirty = false;
   }
 }
 

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

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

package/nitrogen/generated/android/kotlin/com/margelo/nitro/stroketext/HybridStrokeTextViewSpec.kt

@@ -10,6 +10,7 @@ package com.margelo.nitro.stroketext
 import androidx.annotation.Keep
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
+import com.margelo.nitro.core.HybridObject
 import com.margelo.nitro.views.HybridView
 
 /**
@@ -24,23 +25,6 @@ import com.margelo.nitro.views.HybridView
   "LocalVariableName", "PropertyName", "PrivatePropertyName", "FunctionName"
 )
 abstract class HybridStrokeTextViewSpec: HybridView() {
-  @DoNotStrip
-  private var mHybridData: HybridData = initHybrid()
-
-  init {
-    super.updateNative(mHybridData)
-  }
-
-  override fun updateNative(hybridData: HybridData) {
-    mHybridData = hybridData
-    super.updateNative(hybridData)
-  }
-
-  // Default implementation of `HybridObject.toString()`
-  override fun toString(): String {
-    return "[HybridObject StrokeTextView]"
-  }
-
   // Properties
   @get:DoNotStrip
   @get:Keep
@@ -207,7 +191,21 @@ abstract class HybridStrokeTextViewSpec: HybridView() {
   // Methods
   
 
-  private external fun initHybrid(): HybridData
+  // Default implementation of `HybridObject.toString()`
+  override fun toString(): String {
+    return "[HybridObject StrokeTextView]"
+  }
+
+  // C++ backing class
+  @DoNotStrip
+  @Keep
+  protected open class CxxPart(javaPart: HybridStrokeTextViewSpec): HybridObject.CxxPart(javaPart) {
+    // C++ JHybridStrokeTextViewSpec::CxxPart::initHybrid(...)
+    external override fun initHybrid(): HybridData
+  }
+  override fun createCxxPart(): CxxPart {
+    return CxxPart(this)
+  }
 
   companion object {
     protected const val TAG = "HybridStrokeTextViewSpec"

package/nitrogen/generated/android/kotlin/com/margelo/nitro/stroketext/views/HybridStrokeTextViewManager.kt

@@ -19,7 +19,7 @@ import com.margelo.nitro.stroketext.*
 /**
  * Represents the React Native `ViewManager` for the "StrokeTextView" Nitro HybridView.
  */
-open class HybridStrokeTextViewManager: SimpleViewManager<View>() {
+public class HybridStrokeTextViewManager: SimpleViewManager<View>() {
   init {
     if (RecyclableView::class.java.isAssignableFrom(HybridStrokeTextView::class.java)) {
       // Enable view recycling
@@ -39,7 +39,7 @@ open class HybridStrokeTextViewManager: SimpleViewManager<View>() {
   }
 
   override fun updateState(view: View, props: ReactStylesDiffMap, stateWrapper: StateWrapper): Any? {
-    val hybridView = view.getTag(associated_hybrid_view_tag) as? HybridStrokeTextView
+    val hybridView = getHybridView(view)
       ?: throw Error("Couldn't find view $view in local views table!")
 
     // 1. Update each prop individually
@@ -51,9 +51,15 @@ open class HybridStrokeTextViewManager: SimpleViewManager<View>() {
     return super.updateState(view, props, stateWrapper)
   }
 
+  override fun onDropViewInstance(view: View) {
+    val hybridView = getHybridView(view)
+    hybridView?.onDropView()
+    return super.onDropViewInstance(view)
+  }
+
   protected override fun prepareToRecycleView(reactContext: ThemedReactContext, view: View): View? {
     super.prepareToRecycleView(reactContext, view)
-    val hybridView = view.getTag(associated_hybrid_view_tag) as? HybridStrokeTextView
+    val hybridView = getHybridView(view)
       ?: return null
 
     @Suppress("USELESS_IS_CHECK")
@@ -67,4 +73,8 @@ open class HybridStrokeTextViewManager: SimpleViewManager<View>() {
       return null
     }
   }
+
+  private fun getHybridView(view: View): HybridStrokeTextView? {
+    return view.getTag(associated_hybrid_view_tag) as? HybridStrokeTextView
+  }
 }

package/nitrogen/generated/ios/NitroStrokeText+autolinking.rb

@@ -56,5 +56,7 @@ def add_nitrogen_files(spec)
     "SWIFT_OBJC_INTEROP_MODE" => "objcxx",
     # Enables stricter modular headers
     "DEFINES_MODULE" => "YES",
+    # Disable auto-generated ObjC header for Swift (Static linkage on Xcode 26.4 breaks here)
+    "SWIFT_INSTALL_OBJC_HEADER" => "NO",
   })
 end

package/nitrogen/generated/ios/NitroStrokeText-Swift-Cxx-Bridge.hpp

@@ -57,7 +57,7 @@ namespace margelo::nitro::stroketext::bridge::swift {
     return optional.has_value();
   }
   inline std::string get_std__optional_std__string_(const std::optional<std::string>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::optional<double>
@@ -72,7 +72,7 @@ namespace margelo::nitro::stroketext::bridge::swift {
     return optional.has_value();
   }
   inline double get_std__optional_double_(const std::optional<double>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::optional<StrokeTextFontStyle>
@@ -87,7 +87,7 @@ namespace margelo::nitro::stroketext::bridge::swift {
     return optional.has_value();
   }
   inline StrokeTextFontStyle get_std__optional_StrokeTextFontStyle_(const std::optional<StrokeTextFontStyle>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::optional<StrokeTextAlign>
@@ -102,7 +102,7 @@ namespace margelo::nitro::stroketext::bridge::swift {
     return optional.has_value();
   }
   inline StrokeTextAlign get_std__optional_StrokeTextAlign_(const std::optional<StrokeTextAlign>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::optional<StrokeTextAlignVertical>
@@ -117,7 +117,7 @@ namespace margelo::nitro::stroketext::bridge::swift {
     return optional.has_value();
   }
   inline StrokeTextAlignVertical get_std__optional_StrokeTextAlignVertical_(const std::optional<StrokeTextAlignVertical>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::optional<StrokeTextDecorationLine>
@@ -132,7 +132,7 @@ namespace margelo::nitro::stroketext::bridge::swift {
     return optional.has_value();
   }
   inline StrokeTextDecorationLine get_std__optional_StrokeTextDecorationLine_(const std::optional<StrokeTextDecorationLine>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::optional<StrokeTextTransform>
@@ -147,7 +147,7 @@ namespace margelo::nitro::stroketext::bridge::swift {
     return optional.has_value();
   }
   inline StrokeTextTransform get_std__optional_StrokeTextTransform_(const std::optional<StrokeTextTransform>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::optional<bool>
@@ -162,7 +162,7 @@ namespace margelo::nitro::stroketext::bridge::swift {
     return optional.has_value();
   }
   inline bool get_std__optional_bool_(const std::optional<bool>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::optional<StrokeTextEllipsizeMode>
@@ -177,7 +177,7 @@ namespace margelo::nitro::stroketext::bridge::swift {
     return optional.has_value();
   }
   inline StrokeTextEllipsizeMode get_std__optional_StrokeTextEllipsizeMode_(const std::optional<StrokeTextEllipsizeMode>& optional) noexcept {
-    return *optional;
+    return optional.value();
   }
   
   // pragma MARK: std::shared_ptr<HybridStrokeTextViewSpec>

package/nitrogen/generated/ios/c++/views/HybridStrokeTextViewComponent.mm

@@ -17,6 +17,13 @@
 #import "HybridStrokeTextViewSpecSwift.hpp"
 #import "NitroStrokeText-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::stroketext;
 using namespace margelo::nitro::stroketext::views;
@@ -234,4 +241,12 @@ using namespace margelo::nitro::stroketext::views;
   swiftPart.maybePrepareForRecycle();
 }
 
+#ifdef ENABLE_RCT_COMPONENT_VIEW_INVALIDATE
+- (void)invalidate {
+  NitroStrokeText::HybridStrokeTextViewSpec_cxx& swiftPart = _hybridView->getSwiftPart();
+  swiftPart.onDropView();
+  [super invalidate];
+}
+#endif
+
 @end

package/nitrogen/generated/ios/swift/HybridStrokeTextViewSpec.swift

@@ -5,7 +5,6 @@
 /// Copyright © Marc Rousavy @ Margelo
 ///
 
-import Foundation
 import NitroModules
 
 /// See ``HybridStrokeTextViewSpec``