@matiks/rn-stroke-text 0.1.3 → 0.1.5

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

@@ -14,9 +14,7 @@ import android.view.View
 import kotlin.math.ceil
 import kotlin.math.max
 
-class StrokeTextView(
-    context: Context
-) : View(context) {
+class StrokeTextView(context: Context) : View(context) {
 
     // ─────────────────────────────────────────────
     // Props
@@ -37,15 +35,14 @@ class StrokeTextView(
     // Paints
     // ─────────────────────────────────────────────
 
-    private val textPaint = TextPaint(Paint.ANTI_ALIAS_FLAG).apply {
-        style = Paint.Style.FILL
-    }
+    private val textPaint = TextPaint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.FILL }
 
-    private val strokePaint = TextPaint(Paint.ANTI_ALIAS_FLAG).apply {
-        style = Paint.Style.STROKE
-        strokeJoin = Paint.Join.ROUND
-        strokeCap = Paint.Cap.ROUND
-    }
+    private val strokePaint =
+            TextPaint(Paint.ANTI_ALIAS_FLAG).apply {
+                style = Paint.Style.STROKE
+                strokeJoin = Paint.Join.ROUND
+                strokeCap = Paint.Cap.ROUND
+            }
 
     // ─────────────────────────────────────────────
     // Layout
@@ -54,6 +51,7 @@ class StrokeTextView(
     private var textLayout: StaticLayout? = null
     private var strokeLayout: StaticLayout? = null
     private var layoutDirty = true
+    private var lastLayoutWidth: Int = -1 // Track width used for layout
 
     private val fontCache = HashMap<String, Typeface?>()
 
@@ -69,10 +67,7 @@ class StrokeTextView(
 
         val desiredHeight = (textLayout?.height ?: 0).coerceAtLeast(1)
 
-        setMeasuredDimension(
-            measuredWidth,
-            resolveSize(desiredHeight, heightMeasureSpec)
-        )
+        setMeasuredDimension(measuredWidth, resolveSize(desiredHeight, heightMeasureSpec))
     }
 
     private fun resolveMeasuredWidth(spec: Int): Int {
@@ -120,76 +115,100 @@ class StrokeTextView(
     }
 
     private fun ensureLayout(width: Int) {
-        if (!layoutDirty && textLayout != null) return
-
         val safeWidth = width.coerceAtLeast(1)
+        if (!layoutDirty && textLayout != null && lastLayoutWidth == safeWidth) return
         updatePaints()
 
         var displayText: CharSequence =
-            if (ellipsis) {
-                TextUtils.ellipsize(
-                    text,
-                    textPaint,
-                    safeWidth.toFloat(),
-                    TextUtils.TruncateAt.END
-                )
-            } else {
-                text
-            }
+                if (ellipsis) {
+                    TextUtils.ellipsize(
+                            text,
+                            textPaint,
+                            safeWidth.toFloat(),
+                            TextUtils.TruncateAt.END
+                    )
+                } else {
+                    text
+                }
 
         // Use StaticLayout.Builder for API 23+
-        val builder = StaticLayout.Builder.obtain(displayText, 0, displayText.length, textPaint, safeWidth)
-            .setAlignment(alignment)
-            .setLineSpacing(0f, 1f)
-            .setIncludePad(false)
+        val builder =
+                StaticLayout.Builder.obtain(
+                                displayText,
+                                0,
+                                displayText.length,
+                                textPaint,
+                                safeWidth
+                        )
+                        .setAlignment(alignment)
+                        .setLineSpacing(0f, 1f)
+                        .setIncludePad(false)
 
         var layout = builder.build()
 
         if (numberOfLines > 0 && layout.lineCount > numberOfLines) {
             val end = layout.getLineEnd(numberOfLines - 1)
             displayText = displayText.subSequence(0, end)
-            
-            val truncatedBuilder = StaticLayout.Builder.obtain(displayText, 0, displayText.length, textPaint, safeWidth)
-                .setAlignment(alignment)
-                .setLineSpacing(0f, 1f)
-                .setIncludePad(false)
-            
+
+            val truncatedBuilder =
+                    StaticLayout.Builder.obtain(
+                                    displayText,
+                                    0,
+                                    displayText.length,
+                                    textPaint,
+                                    safeWidth
+                            )
+                            .setAlignment(alignment)
+                            .setLineSpacing(0f, 1f)
+                            .setIncludePad(false)
+
             layout = truncatedBuilder.build()
         }
 
         textLayout = layout
-        
+
         // For stroke layout, we use the same text
-        val strokeBuilder = StaticLayout.Builder.obtain(displayText, 0, displayText.length, strokePaint, safeWidth)
-            .setAlignment(alignment)
-            .setLineSpacing(0f, 1f)
-            .setIncludePad(false)
-            
+        val strokeBuilder =
+                StaticLayout.Builder.obtain(
+                                displayText,
+                                0,
+                                displayText.length,
+                                strokePaint,
+                                safeWidth
+                        )
+                        .setAlignment(alignment)
+                        .setLineSpacing(0f, 1f)
+                        .setIncludePad(false)
+
         strokeLayout = strokeBuilder.build()
 
+        lastLayoutWidth = safeWidth // Remember the width used
         layoutDirty = false
     }
 
     fun getTextDimensions(): Pair<Double, Double> {
         updatePaints()
-        
-        // Ensure we have a valid layout for measurement. 
+
+        // Ensure we have a valid layout for measurement.
         // If width is 0/unspecified, we measure intrinsic width.
-        val measureWidth = if (customWidthPx > 0f) {
-            ceil(customWidthPx).toInt()
-        } else {
-            ceil(measureTextWidth()).toInt()
-        }
-        
+        val measureWidth =
+                if (customWidthPx > 0f) {
+                    ceil(customWidthPx).toInt()
+                } else {
+                    ceil(measureTextWidth()).toInt()
+                }
+
         // We create a temporary layout if needed to get accurate height for the given width
-        // But since ensureLayout caches the layout based on last width, we might want to just ensure layout exists.
-        // For accurate "intrinsic" measurement, we usually want the width to be the text width if not constrained.
-        
+        // But since ensureLayout caches the layout based on last width, we might want to just
+        // ensure layout exists.
+        // For accurate "intrinsic" measurement, we usually want the width to be the text width if
+        // not constrained.
+
         ensureLayout(measureWidth)
 
         val wPx = textLayout?.width?.toFloat() ?: 0f
         val hPx = textLayout?.height?.toFloat() ?: 0f
-        
+
         return Pair(pxToDp(wPx).toDouble(), pxToDp(hPx).toDouble())
     }
 
@@ -224,7 +243,7 @@ class StrokeTextView(
     }
 
     fun setFontSize(value: Float) {
-        val px = sp(value)
+        val px = dp(value)
         if (fontSizePx != px) {
             fontSizePx = px
             invalidateLayout()
@@ -263,12 +282,13 @@ class StrokeTextView(
     }
 
     fun setTextAlignment(value: String) {
-        val newAlignment = when (value) {
-            "left" -> Layout.Alignment.ALIGN_NORMAL
-            "right" -> Layout.Alignment.ALIGN_OPPOSITE
-            "center" -> Layout.Alignment.ALIGN_CENTER
-            else -> alignment
-        }
+        val newAlignment =
+                when (value) {
+                    "left" -> Layout.Alignment.ALIGN_NORMAL
+                    "right" -> Layout.Alignment.ALIGN_OPPOSITE
+                    "center" -> Layout.Alignment.ALIGN_CENTER
+                    else -> alignment
+                }
         if (alignment != newAlignment) {
             alignment = newAlignment
             invalidateLayout()
@@ -308,35 +328,27 @@ class StrokeTextView(
     }
 
     private fun sp(v: Float): Float =
-        TypedValue.applyDimension(
-            TypedValue.COMPLEX_UNIT_SP,
-            v,
-            resources.displayMetrics
-        )
+            TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, v, resources.displayMetrics)
 
     private fun dp(v: Float): Float =
-        TypedValue.applyDimension(
-            TypedValue.COMPLEX_UNIT_DIP,
-            v,
-            resources.displayMetrics
-        )
+            TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, v, resources.displayMetrics)
 
-    private fun pxToDp(px: Float): Float =
-        px / resources.displayMetrics.density
+    private fun pxToDp(px: Float): Float = px / resources.displayMetrics.density
 
     private fun parseColor(color: String): Int =
-        try {
-            Color.parseColor(color)
-        } catch (_: Exception) {
-            Color.BLACK
-        }
+            try {
+                Color.parseColor(color)
+            } catch (_: Exception) {
+                Color.BLACK
+            }
 
     private fun getFont(fontFamily: String): Typeface? {
-        return fontCache[fontFamily] ?: run {
-            val tf = FontUtil.getFont(context, fontFamily)
-            fontCache[fontFamily] = tf
-            tf
-        }
+        return fontCache[fontFamily]
+                ?: run {
+                    val tf = FontUtil.getFont(context, fontFamily)
+                    fontCache[fontFamily] = tf
+                    tf
+                }
     }
 
     init {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matiks/rn-stroke-text",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "rn-stroke-text",
   "main": "lib/index",
   "module": "lib/index",