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

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

@@ -58,6 +58,10 @@ internal class StrokeTextView(context: ThemedReactContext) : TextView(context) {
   init {
     gravity = Gravity.TOP or Gravity.START
     includeFontPadding = true
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+      breakStrategy = Layout.BREAK_STRATEGY_HIGH_QUALITY
+      hyphenationFrequency = Layout.HYPHENATION_FREQUENCY_NONE
+    }
   }
 
   fun invalidateTextLayout() {
@@ -70,20 +74,22 @@ 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) {
-      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
+    if (layout == null || strokeWidthPx <= 0f || strokeColor == Color.TRANSPARENT) {
+      super.onDraw(canvas)
+      return
+    }
 
+    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())
 
@@ -98,6 +104,12 @@ 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
@@ -108,8 +120,6 @@ internal class StrokeTextView(context: ThemedReactContext) : TextView(context) {
       textPaint.isUnderlineText = prevUnderline
       textPaint.isStrikeThruText = prevStrike
     }
-
-    super.onDraw(canvas)
   }
 
   private fun applyProps() {

package/lib/StrokeText.js

@@ -148,7 +148,7 @@ export function StrokeText({ text, children, style, hybridRef, ...rest }) {
 const styles = StyleSheet.create({
     container: {},
     overlay: {
-        ...StyleSheet.absoluteFillObject,
+        ...StyleSheet.absoluteFill,
     },
     hiddenText: {
         opacity: 0,

package/lib/StrokeText.web.js

@@ -92,7 +92,7 @@ export function StrokeText({ text, children, style, ...rest }) {
 const styles = StyleSheet.create({
     container: {},
     overlay: {
-        ...StyleSheet.absoluteFillObject,
+        ...StyleSheet.absoluteFill,
     },
     hiddenText: {
         opacity: 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whetware/react-native-stroke-text",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "Stroke/outline text for React Native (New Architecture) on iOS, Android, and Web.",
   "type": "module",
   "main": "./lib/index.js",
@@ -28,6 +28,19 @@
     "CHANGELOG.md",
     "README.md"
   ],
+  "scripts": {
+    "typecheck": "tsc --noEmit",
+    "clean": "rm -rf android/build node_modules/**/android/build lib",
+    "lint": "eslint \"**/*.{js,ts,tsx}\" --fix",
+    "lint-ci": "eslint \"**/*.{js,ts,tsx}\"",
+    "typescript": "tsc",
+    "prepare": "npm run prepack",
+    "prepack": "tsc",
+    "changeset": "changeset",
+    "version-packages": "changeset version",
+    "release": "changeset publish",
+    "specs": "tsc --noEmit false && nitrogen --logLevel=\"debug\""
+  },
   "keywords": [
     "react-native",
     "nitro",
@@ -107,16 +120,5 @@
     "trailingComma": "es5",
     "useTabs": false,
     "semi": false
-  },
-  "scripts": {
-    "typecheck": "tsc --noEmit",
-    "clean": "rm -rf android/build node_modules/**/android/build lib",
-    "lint": "eslint \"**/*.{js,ts,tsx}\" --fix",
-    "lint-ci": "eslint \"**/*.{js,ts,tsx}\"",
-    "typescript": "tsc",
-    "changeset": "changeset",
-    "version-packages": "changeset version",
-    "release": "changeset publish",
-    "specs": "tsc --noEmit false && nitrogen --logLevel=\"debug\""
   }
-}
+}