@whetware/react-native-stroke-text 0.0.8 → 0.0.10

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

@@ -3,6 +3,7 @@ package com.margelo.nitro.stroketext
 import android.view.View
 import com.facebook.jni.HybridData
 import com.facebook.react.uimanager.ThemedReactContext
+import kotlin.math.ceil
 
 class HybridStrokeTextView(context: ThemedReactContext) : HybridStrokeTextViewSpec() {
   private val strokeTextView = StrokeTextView(context)
@@ -77,12 +78,14 @@ class HybridStrokeTextView(context: ThemedReactContext) : HybridStrokeTextViewSp
         )
 
     strokeTextView.fontSizePx =
-        StrokeTextView.textToPx(
-            fontSize ?: 14.0,
-            resolvedAllowFontScaling,
-            resolvedMaxFontSizeMultiplier,
-            displayMetrics,
-        )
+        ceil(
+            StrokeTextView.textToPx(
+                fontSize ?: 14.0,
+                resolvedAllowFontScaling,
+                resolvedMaxFontSizeMultiplier,
+                displayMetrics,
+            ).toDouble()
+        ).toFloat()
     strokeTextView.fontWeight = fontWeight
     strokeTextView.fontFamily = fontFamily
     strokeTextView.fontStyle = fontStyle ?: StrokeTextFontStyle.NORMAL

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

@@ -74,22 +74,20 @@ internal class StrokeTextView(context: ThemedReactContext) : TextView(context) {
     // Draw stroke behind fill, using TextView's layout so metrics match RN <Text/> as closely as
     // possible (especially for bold fonts).
     val layout = layout
-    if (layout == null || strokeWidthPx <= 0f || strokeColor == Color.TRANSPARENT) {
-      super.onDraw(canvas)
-      return
-    }
+    if (layout != null && strokeWidthPx > 0f && strokeColor != Color.TRANSPARENT) {
+      val textPaint = paint
+      val prevStyle = textPaint.style
+      val prevStrokeWidth = textPaint.strokeWidth
+      val prevStrokeJoin = textPaint.strokeJoin
+      val prevStrokeCap = textPaint.strokeCap
+      val prevColor = textPaint.color
+      val prevUnderline = textPaint.isUnderlineText
+      val prevStrike = textPaint.isStrikeThruText
+
+      val saveCount = canvas.save()
+      val compoundPaddingLeft = compoundPaddingLeft
+      val extendedPaddingTop = extendedPaddingTop
 
-    val textPaint = paint
-    val prevStyle = textPaint.style
-    val prevStrokeWidth = textPaint.strokeWidth
-    val prevStrokeJoin = textPaint.strokeJoin
-    val prevStrokeCap = textPaint.strokeCap
-    val prevColor = textPaint.color
-    val prevUnderline = textPaint.isUnderlineText
-    val prevStrike = textPaint.isStrikeThruText
-
-    val saveCount = canvas.save()
-    try {
       canvas.translate(compoundPaddingLeft.toFloat(), extendedPaddingTop.toFloat())
       canvas.translate(-scrollX.toFloat(), -scrollY.toFloat())
 
@@ -104,12 +102,6 @@ internal class StrokeTextView(context: ThemedReactContext) : TextView(context) {
       textPaint.color = strokeColor
       layout.draw(canvas)
 
-      textPaint.style = Paint.Style.FILL
-      textPaint.color = prevColor
-      textPaint.isUnderlineText = prevUnderline
-      textPaint.isStrikeThruText = prevStrike
-      layout.draw(canvas)
-    } finally {
       canvas.restoreToCount(saveCount)
 
       textPaint.style = prevStyle
@@ -120,6 +112,8 @@ internal class StrokeTextView(context: ThemedReactContext) : TextView(context) {
       textPaint.isUnderlineText = prevUnderline
       textPaint.isStrikeThruText = prevStrike
     }
+
+    super.onDraw(canvas)
   }
 
   private fun applyProps() {

package/package.json

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