@matiks/rn-stroke-text 0.0.1 → 0.0.2

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

@@ -137,41 +137,35 @@ class StrokeTextView(
                 text
             }
 
-        var layout = StaticLayout(
-            displayText,
-            textPaint,
-            safeWidth,
-            alignment,
-            1f,
-            0f,
-            false
-        )
+        // Use StaticLayout.Builder for API 23+
+        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)
-
-            layout = StaticLayout(
-                displayText,
-                textPaint,
-                safeWidth,
-                alignment,
-                1f,
-                0f,
-                false
-            )
+            
+            val truncatedBuilder = StaticLayout.Builder.obtain(displayText, 0, displayText.length, textPaint, safeWidth)
+                .setAlignment(alignment)
+                .setLineSpacing(0f, 1f)
+                .setIncludePad(false)
+            
+            layout = truncatedBuilder.build()
         }
 
         textLayout = layout
-        strokeLayout = StaticLayout(
-            displayText,
-            strokePaint,
-            safeWidth,
-            alignment,
-            1f,
-            0f,
-            false
-        )
+        
+        // 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)
+            
+        strokeLayout = strokeBuilder.build()
 
         layoutDirty = false
     }
@@ -193,10 +187,10 @@ class StrokeTextView(
         
         ensureLayout(measureWidth)
 
-        val w = textLayout?.width?.toDouble() ?: 0.0
-        val h = textLayout?.height?.toDouble() ?: 0.0
+        val wPx = textLayout?.width?.toFloat() ?: 0f
+        val hPx = textLayout?.height?.toFloat() ?: 0f
         
-        return Pair(w, h)
+        return Pair(pxToDp(wPx).toDouble(), pxToDp(hPx).toDouble())
     }
 
     private fun measureTextWidth(): Float {
@@ -327,6 +321,9 @@ class StrokeTextView(
             resources.displayMetrics
         )
 
+    private fun pxToDp(px: Float): Float =
+        px / resources.displayMetrics.density
+
     private fun parseColor(color: String): Int =
         try {
             Color.parseColor(color)

package/package.json

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

package/src/index.tsx

@@ -15,27 +15,31 @@ interface StrokeTextViewProps extends MatiksStrokeTextProps {
   }
 }
 
-const StrokeTextView = ({ styles, ...props }: StrokeTextViewProps) => {
+const StrokeTextView = ({ text, styles, ...props }: StrokeTextViewProps) => {
   const ref = useRef<MatiksStrokeText | null>(null);
   const [size, setSize] = useState({ width: 0, height: 0 });
+  const [isReady, setIsReady] = useState(false)
 
   useEffect(() => {
     if (!ref.current) return;
-
     const result = ref.current.measureDimensions();
     setSize(result);
   }, [
     props.fontFamily,
     props.fontSize,
-    props.text,
+    text,
+    isReady
   ]);
 
   return (
     <StrokeTextViewComponent
       {...props}
+      text={String(text)}
       style={[{ width: size.width, height: size.height }, styles]}
       hybridRef={callback((_ref) => {
+        if(ref.current) return
         ref.current = _ref;
+        setIsReady(true)
       })}
     />
   );