@whetware/react-native-stroke-text 0.0.3 → 0.0.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @whetware/react-native-stroke-text
 
+## 0.0.4
+
+### Patch Changes
+
+- [`80ded08`](https://github.com/whetware/react-native-stroke-text/commit/80ded08eb3acf84344f56e12b24f74f771726ec1) Thanks [@evelant](https://github.com/evelant)! - Fix handles leak on Android causing crash
+
 ## 0.0.3
 
 ### Patch Changes

package/android/src/main/java/com/margelo/nitro/stroketext/HybridStrokeTextView.kt

@@ -1,12 +1,16 @@
 package com.margelo.nitro.stroketext
 
 import android.view.View
+import com.facebook.jni.HybridData
 import com.facebook.react.uimanager.ThemedReactContext
+import com.margelo.nitro.views.RecyclableView
 
-class HybridStrokeTextView(context: ThemedReactContext) : HybridStrokeTextViewSpec() {
+class HybridStrokeTextView(context: ThemedReactContext) : HybridStrokeTextViewSpec(), RecyclableView {
   private val strokeTextView = StrokeTextView(context)
   override val view: View = strokeTextView
 
+  private var isDisposed = false
+
   override var text: String = ""
   override var color: String? = null
   override var strokeColor: String? = null
@@ -34,6 +38,54 @@ class HybridStrokeTextView(context: ThemedReactContext) : HybridStrokeTextViewSp
   override var paddingBottom: Double? = null
   override var paddingLeft: Double? = null
 
+  override fun dispose() {
+    if (isDisposed) return
+    isDisposed = true
+    super.dispose()
+
+    try {
+      val hybridDataField = HybridStrokeTextViewSpec::class.java.getDeclaredField("mHybridData")
+      hybridDataField.isAccessible = true
+      val hybridData = hybridDataField.get(this) as? HybridData ?: return
+
+      val resetNativeMethod = HybridData::class.java.getDeclaredMethod("resetNative")
+      resetNativeMethod.isAccessible = true
+      resetNativeMethod.invoke(hybridData)
+    } catch (_: Throwable) {
+    }
+  }
+
+  override fun prepareForRecycle() {
+    text = ""
+    color = null
+    strokeColor = null
+    strokeWidth = null
+    fontSize = null
+    fontWeight = null
+    fontFamily = null
+    fontStyle = null
+    lineHeight = null
+    letterSpacing = null
+    textAlign = null
+    textDecorationLine = null
+    textTransform = null
+    opacity = null
+    allowFontScaling = null
+    maxFontSizeMultiplier = null
+    includeFontPadding = null
+    numberOfLines = null
+    ellipsizeMode = null
+    padding = null
+    paddingVertical = null
+    paddingHorizontal = null
+    paddingTop = null
+    paddingRight = null
+    paddingBottom = null
+    paddingLeft = null
+
+    afterUpdate()
+  }
+
   override fun afterUpdate() {
     val displayMetrics = strokeTextView.resources.displayMetrics
     val resolvedAllowFontScaling = allowFontScaling ?: true

package/android/src/main/java/com/margelo/nitro/stroketext/NitroStrokeTextPackage.kt

@@ -7,12 +7,12 @@ import com.facebook.react.BaseReactPackage
 import com.facebook.react.ViewManagerOnDemandReactPackage
 import com.facebook.react.bridge.ModuleSpec
 import com.facebook.react.uimanager.ViewManager
-import com.margelo.nitro.stroketext.views.HybridStrokeTextViewManager
+import com.margelo.nitro.stroketext.views.StrokeTextViewManager
 
 class NitroStrokeTextPackage : BaseReactPackage(), ViewManagerOnDemandReactPackage {
     private val viewManagers: Map<String, ModuleSpec> by lazy {
         mapOf(
-            "StrokeTextView" to ModuleSpec.viewManagerSpec { HybridStrokeTextViewManager() }
+            "StrokeTextView" to ModuleSpec.viewManagerSpec { StrokeTextViewManager() }
         )
     }
 

package/android/src/main/java/com/margelo/nitro/stroketext/views/StrokeTextViewManager.kt

@@ -0,0 +1,15 @@
+package com.margelo.nitro.stroketext.views
+
+import android.view.View
+import com.margelo.nitro.R.id.associated_hybrid_view_tag
+import com.margelo.nitro.stroketext.HybridStrokeTextView
+
+class StrokeTextViewManager : HybridStrokeTextViewManager() {
+  override fun onDropViewInstance(view: View) {
+    val hybridView = view.getTag(associated_hybrid_view_tag) as? HybridStrokeTextView
+    view.setTag(associated_hybrid_view_tag, null)
+    hybridView?.dispose()
+    super.onDropViewInstance(view)
+  }
+}
+

package/lib/StrokeText.js

@@ -88,6 +88,7 @@ export function StrokeText({ text, children, style, hybridRef, ...rest }) {
         ? undefined
         : nativeProps.ellipsizeMode ?? 'tail';
     const effectiveIncludeFontPadding = nativeProps.includeFontPadding ?? styleIncludeFontPadding ?? false;
+    const wrappedHybridRef = React.useMemo(() => (hybridRef ? callback(hybridRef) : undefined), [hybridRef]);
     return (React.createElement(View, { style: [styles.container, containerStyle, strokeInsetMarginStyle] },
         React.createElement(Text, { accessible: false, pointerEvents: "none", numberOfLines: effectiveNumberOfLines, ellipsizeMode: effectiveEllipsizeMode, allowFontScaling: nativeProps.allowFontScaling, maxFontSizeMultiplier: nativeProps.maxFontSizeMultiplier, style: [
                 style,
@@ -102,7 +103,7 @@ export function StrokeText({ text, children, style, hybridRef, ...rest }) {
                     : { includeFontPadding: effectiveIncludeFontPadding },
                 styles.hiddenText,
             ] }, resolvedText),
-        React.createElement(NativeStrokeTextView, { ...nativeProps, text: resolvedText, color: nativeProps.color ?? toColorString(styleColor), fontSize: nativeProps.fontSize ?? toNumber(styleFontSize), fontWeight: nativeProps.fontWeight ?? toFontWeightString(styleFontWeight), fontFamily: nativeProps.fontFamily ?? styleFontFamily, fontStyle: nativeProps.fontStyle ?? styleFontStyle, lineHeight: nativeProps.lineHeight ?? toNumber(styleLineHeight), letterSpacing: nativeProps.letterSpacing ?? toNumber(styleLetterSpacing), textAlign: nativeProps.textAlign ?? styleTextAlign, textDecorationLine: nativeProps.textDecorationLine ?? styleTextDecorationLine, textTransform: nativeProps.textTransform ?? styleTextTransform, opacity: nativeProps.opacity ?? toNumber(styleOpacity), includeFontPadding: effectiveIncludeFontPadding, numberOfLines: nativeProps.numberOfLines, ellipsizeMode: effectiveEllipsizeMode, paddingTop: baseTop, paddingRight: baseRight, paddingBottom: baseBottom, paddingLeft: baseLeft, hybridRef: hybridRef ? callback(hybridRef) : undefined, pointerEvents: "none", style: styles.overlay })));
+        React.createElement(NativeStrokeTextView, { ...nativeProps, text: resolvedText, color: nativeProps.color ?? toColorString(styleColor), fontSize: nativeProps.fontSize ?? toNumber(styleFontSize), fontWeight: nativeProps.fontWeight ?? toFontWeightString(styleFontWeight), fontFamily: nativeProps.fontFamily ?? styleFontFamily, fontStyle: nativeProps.fontStyle ?? styleFontStyle, lineHeight: nativeProps.lineHeight ?? toNumber(styleLineHeight), letterSpacing: nativeProps.letterSpacing ?? toNumber(styleLetterSpacing), textAlign: nativeProps.textAlign ?? styleTextAlign, textDecorationLine: nativeProps.textDecorationLine ?? styleTextDecorationLine, textTransform: nativeProps.textTransform ?? styleTextTransform, opacity: nativeProps.opacity ?? toNumber(styleOpacity), includeFontPadding: effectiveIncludeFontPadding, numberOfLines: nativeProps.numberOfLines, ellipsizeMode: effectiveEllipsizeMode, paddingTop: baseTop, paddingRight: baseRight, paddingBottom: baseBottom, paddingLeft: baseLeft, hybridRef: wrappedHybridRef, pointerEvents: "none", style: styles.overlay })));
 }
 const styles = StyleSheet.create({
     container: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whetware/react-native-stroke-text",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Stroke/outline text for React Native (New Architecture) on iOS, Android, and Web.",
   "type": "module",
   "main": "./lib/index.js",