npm - @whetware/react-native-stroke-text - Versions diffs - 0.0.9 → 0.0.10 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

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

@@ -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 CHANGED Viewed

@@ -85,6 +85,8 @@ internal class StrokeTextView(context: ThemedReactContext) : TextView(context) {
       val prevStrike = textPaint.isStrikeThruText
       val saveCount = canvas.save()
+      val compoundPaddingLeft = compoundPaddingLeft
+      val extendedPaddingTop = extendedPaddingTop
       canvas.translate(compoundPaddingLeft.toFloat(), extendedPaddingTop.toFloat())
       canvas.translate(-scrollX.toFloat(), -scrollY.toFloat())

package/lib/StrokeText.js CHANGED Viewed

@@ -1,5 +1,5 @@
 import React from 'react';
-import { I18nManager, StyleSheet, Text, View, } from 'react-native';
+import { StyleSheet, Text, View } from 'react-native';
 import { callback, getHostComponent } from 'react-native-nitro-modules';
 import StrokeTextViewConfig from '../nitrogen/generated/shared/json/StrokeTextViewConfig.json';
 const NativeStrokeTextView = getHostComponent('StrokeTextView', () => StrokeTextViewConfig);
@@ -71,32 +71,12 @@ export function StrokeText({ text, children, style, hybridRef, ...rest }) {
     const baseRight = firstNumber(paddingRight, stylePaddingRight, paddingHorizontal, stylePaddingHorizontal, padding, stylePadding) ?? 0;
     const baseBottom = firstNumber(paddingBottom, stylePaddingBottom, paddingVertical, stylePaddingVertical, padding, stylePadding) ?? 0;
     const baseLeft = firstNumber(paddingLeft, stylePaddingLeft, paddingHorizontal, stylePaddingHorizontal, padding, stylePadding) ?? 0;
-    const baseMarginTop = firstNumber(containerStyle.marginTop, containerStyle.marginVertical, containerStyle.margin) ?? 0;
-    const baseMarginRight = firstNumber(containerStyle.marginRight, I18nManager.isRTL ? containerStyle.marginStart : containerStyle.marginEnd, containerStyle.marginHorizontal, containerStyle.margin) ?? 0;
-    const baseMarginBottom = firstNumber(containerStyle.marginBottom, containerStyle.marginVertical, containerStyle.margin) ?? 0;
-    const baseMarginLeft = firstNumber(containerStyle.marginLeft, I18nManager.isRTL ? containerStyle.marginEnd : containerStyle.marginStart, containerStyle.marginHorizontal, containerStyle.margin) ?? 0;
-    const baseMarginStart = toNumber(containerStyle.marginStart);
-    const baseMarginEnd = toNumber(containerStyle.marginEnd);
-    const strokeInsetMarginStyle = strokeInset === 0
-        ? null
-        : {
-            marginTop: baseMarginTop - strokeInset,
-            marginRight: baseMarginRight - strokeInset,
-            marginBottom: baseMarginBottom - strokeInset,
-            marginLeft: baseMarginLeft - strokeInset,
-            ...(baseMarginStart == null
-                ? {}
-                : { marginStart: baseMarginStart - strokeInset }),
-            ...(baseMarginEnd == null
-                ? {}
-                : { marginEnd: baseMarginEnd - strokeInset }),
-        };
     const effectiveNumberOfLines = nativeProps.numberOfLines != null && nativeProps.numberOfLines > 0
         ? nativeProps.numberOfLines
         : undefined;
     const effectiveEllipsizeMode = effectiveNumberOfLines == null
         ? undefined
-        : (nativeProps.ellipsizeMode ?? 'tail');
+        : nativeProps.ellipsizeMode ?? 'tail';
     const mappedTextAlignVerticalFromVerticalAlign = styleVerticalAlign === 'middle'
         ? 'center'
         : toTextAlignVertical(styleVerticalAlign);
@@ -142,18 +122,28 @@ export function StrokeText({ text, children, style, hybridRef, ...rest }) {
         effectiveTextTransform,
         effectiveIncludeFontPadding,
     ]);
-    return (React.createElement(View, { style: [styles.container, containerStyle, strokeInsetMarginStyle] },
+    return (React.createElement(View, { style: [styles.container, containerStyle] },
         React.createElement(Text, { accessible: false, pointerEvents: "none", numberOfLines: effectiveNumberOfLines, ellipsizeMode: effectiveEllipsizeMode, allowFontScaling: nativeProps.allowFontScaling, maxFontSizeMultiplier: nativeProps.maxFontSizeMultiplier, style: [
                 measurerTextStyle,
                 {
-                    paddingTop: baseTop + strokeInset,
-                    paddingRight: baseRight + strokeInset,
-                    paddingBottom: baseBottom + strokeInset,
-                    paddingLeft: baseLeft + strokeInset,
+                    paddingTop: baseTop,
+                    paddingRight: baseRight,
+                    paddingBottom: baseBottom,
+                    paddingLeft: baseLeft,
                 },
                 styles.hiddenText,
             ] }, resolvedText),
-        React.createElement(NativeStrokeTextView, { ...nativeProps, text: resolvedText, color: effectiveColor, fontSize: effectiveFontSize, fontWeight: effectiveFontWeight, fontFamily: effectiveFontFamily, fontStyle: effectiveFontStyle, lineHeight: effectiveLineHeight, letterSpacing: effectiveLetterSpacing, textAlign: effectiveTextAlign, textAlignVertical: effectiveTextAlignVertical, textDecorationLine: effectiveTextDecorationLine, textTransform: effectiveTextTransform, 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 })));
+        React.createElement(NativeStrokeTextView, { ...nativeProps, text: resolvedText, color: effectiveColor, fontSize: effectiveFontSize, fontWeight: effectiveFontWeight, fontFamily: effectiveFontFamily, fontStyle: effectiveFontStyle, lineHeight: effectiveLineHeight, letterSpacing: effectiveLetterSpacing, textAlign: effectiveTextAlign, textAlignVertical: effectiveTextAlignVertical, textDecorationLine: effectiveTextDecorationLine, textTransform: effectiveTextTransform, 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,
+                strokeInset === 0
+                    ? null
+                    : {
+                        top: -strokeInset,
+                        right: -strokeInset,
+                        bottom: -strokeInset,
+                        left: -strokeInset,
+                    },
+            ] })));
 }
 const styles = StyleSheet.create({
     container: {},

package/package.json CHANGED Viewed

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