react-native-advanced-text 0.1.29 → 0.1.31

package/android/src/main/java/com/advancedtext/AdvancedTextView.kt

@@ -138,6 +138,13 @@ class AdvancedTextView : TextView {
         }
     }
 
+    fun setAdvancedLineHeight(multiplier: Float) {
+        if (lineHeightMultiplier == multiplier) return
+        lineHeightMultiplier = multiplier
+        updateTextWithHighlights()
+    }
+
+
     fun setAdvancedFontFamily(family: String) {
         if (fontFamily == family) return
         fontFamily = family
@@ -235,6 +242,11 @@ class AdvancedTextView : TextView {
             else -> Typeface.create(fontFamily, Typeface.NORMAL)
         }
 
+
+        lineSpacingMultiplier = lineHeightMultiplier
+        setLineSpacing(0f, lineHeightMultiplier)
+
+
         post {
             setText(spannableString, BufferType.SPANNABLE)
             Log.d(TAG, "Text updated with ${wordPositions.size} spans")

package/android/src/main/java/com/advancedtext/AdvancedTextViewManager.kt

@@ -123,6 +123,15 @@ class AdvancedTextViewManager : SimpleViewManager<AdvancedTextView>() {
         }
     }
 
+
+    @ReactProp(name = "lineHeight")
+    fun setLineHeight(view: AdvancedTextView?, lineHeight: Float) {
+        android.util.Log.d(NAME, "setLineHeight called with: $lineHeight")
+        if (lineHeight > 0) {
+            view?.setAdvancedLineHeight(lineHeight)
+        }
+    }
+
     override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any> {
         return mapOf(
             "onWordPress" to mapOf("registrationName" to "onWordPress"),

package/ios/AdvancedTextView.mm

@@ -23,6 +23,7 @@ using namespace facebook::react;
 @property (nonatomic, strong) UIColor *textColor;
 @property (nonatomic, strong) NSString *textAlign;
 @property (nonatomic, strong) NSString *fontFamily;
+@property (nonatomic, assign) CGFloat lineHeight;
 
 - (void)handleCustomMenuAction:(UIMenuItem *)sender;
 
@@ -89,6 +90,7 @@ using namespace facebook::react;
             _textColor = [UIColor labelColor];
             _textAlign = @"left";
             _fontFamily = @"System";
+            _lineHeight = 0.0;
 
             [self setupTextView];
             [self setupGestureRecognizers];
@@ -220,6 +222,12 @@ using namespace facebook::react;
             indicatorChanged = YES;
         }
 
+        if (oldViewProps.lineHeight != newViewProps.lineHeight) {
+            NSLog(@"[AdvancedTextView] Updating lineHeight to: %f", newViewProps.lineHeight);
+            _lineHeight = static_cast<CGFloat>(newViewProps.lineHeight);
+            styleChanged = YES;
+        }
+
         if (textChanged) {
             NSString *text = [NSString stringWithUTF8String:newViewProps.text.c_str()];
             [self updateTextContent:text];
@@ -356,7 +364,25 @@ using namespace facebook::react;
         NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc]
                                                         initWithString:_textView.text];
 
+        if (_lineHeight > 0) {
+            NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
 
+            UIFont *font = nil;
+            if (_fontFamily && _fontFamily.length > 0) {
+                font = [UIFont fontWithName:_fontFamily size:_fontSize > 0 ? _fontSize : 16.0];
+            }
+            if (!font) {
+                font = [UIFont systemFontOfSize:_fontSize > 0 ? _fontSize : 16.0];
+            }
+
+            CGFloat lineSpacing = (_lineHeight * font.lineHeight) - font.lineHeight;
+            paragraphStyle.lineSpacing = lineSpacing;
+
+            [attributedString addAttribute:NSParagraphStyleAttributeName
+                                     value:paragraphStyle
+                                     range:NSMakeRange(0, attributedString.length)];
+        }
+        
         UIFont *font = nil;
 
         if (_fontFamily && _fontFamily.length > 0) {

package/lib/module/AdvancedTextViewNativeComponent.ts

@@ -1,26 +1,27 @@
-/* eslint-disable prettier/prettier */
-import type { ViewProps } from 'react-native';
-import { codegenNativeComponent } from 'react-native';
-// @ts-ignore
-import type { DirectEventHandler, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
-
-interface HighlightedWord {
-  index: Int32;
-  highlightColor: string;
-}
-
-export interface NativeProps extends ViewProps {
-  text: string;
-  highlightedWords?: ReadonlyArray<HighlightedWord>;
-  menuOptions?: ReadonlyArray<string>;
-  onWordPress?: DirectEventHandler<{ word: string; index: Int32 }>;
-  onSelection?: DirectEventHandler<{ selectedText: string; event: string }>;
-  indicatorWordIndex?: Int32;
-  fontSize?: Int32;
-  fontWeight?: string;
-  color?: string;
-  textAlign?: string;
-  fontFamily?: string;
-}
-
-export default codegenNativeComponent<NativeProps>('AdvancedTextView');
+/* eslint-disable prettier/prettier */
+import type { ViewProps } from 'react-native';
+import { codegenNativeComponent } from 'react-native';
+// @ts-ignore
+import type { DirectEventHandler, Int32 , Float  } from 'react-native/Libraries/Types/CodegenTypes';
+
+interface HighlightedWord {
+  index: Int32;
+  highlightColor: string;
+}
+
+export interface NativeProps extends ViewProps {
+  text: string;
+  highlightedWords?: ReadonlyArray<HighlightedWord>;
+  menuOptions?: ReadonlyArray<string>;
+  onWordPress?: DirectEventHandler<{ word: string; index: Int32 }>;
+  onSelection?: DirectEventHandler<{ selectedText: string; event: string }>;
+  indicatorWordIndex?: Int32;
+  fontSize?: Int32;
+  fontWeight?: string;
+  color?: string;
+  textAlign?: string;
+  fontFamily?: string;
+  lineHeight?: Float;
+}
+
+export default codegenNativeComponent<NativeProps>('AdvancedTextView');

package/lib/typescript/src/AdvancedTextViewNativeComponent.d.ts

@@ -1,5 +1,5 @@
 import type { ViewProps } from 'react-native';
-import type { DirectEventHandler, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
+import type { DirectEventHandler, Int32, Float } from 'react-native/Libraries/Types/CodegenTypes';
 interface HighlightedWord {
     index: Int32;
     highlightColor: string;
@@ -22,6 +22,7 @@ export interface NativeProps extends ViewProps {
     color?: string;
     textAlign?: string;
     fontFamily?: string;
+    lineHeight?: Float;
 }
 declare const _default: import("react-native/types_generated/Libraries/Utilities/codegenNativeComponent").NativeComponentType<NativeProps>;
 export default _default;

package/lib/typescript/src/AdvancedTextViewNativeComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AdvancedTextViewNativeComponent.d.ts","sourceRoot":"","sources":["../../../src/AdvancedTextViewNativeComponent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAG9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,2CAA2C,CAAC;AAE3F,UAAU,eAAe;IACvB,KAAK,EAAE,KAAK,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IAClD,WAAW,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACpC,WAAW,CAAC,EAAE,kBAAkB,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,KAAK,CAAA;KAAE,CAAC,CAAC;IACjE,WAAW,CAAC,EAAE,kBAAkB,CAAC;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC1E,kBAAkB,CAAC,EAAE,KAAK,CAAC;IAC3B,QAAQ,CAAC,EAAE,KAAK,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;;AAED,wBAAuE"}
+{"version":3,"file":"AdvancedTextViewNativeComponent.d.ts","sourceRoot":"","sources":["../../../src/AdvancedTextViewNativeComponent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAG9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAG,KAAK,EAAG,MAAM,2CAA2C,CAAC;AAEpG,UAAU,eAAe;IACvB,KAAK,EAAE,KAAK,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IAClD,WAAW,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACpC,WAAW,CAAC,EAAE,kBAAkB,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,KAAK,CAAA;KAAE,CAAC,CAAC;IACjE,WAAW,CAAC,EAAE,kBAAkB,CAAC;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC1E,kBAAkB,CAAC,EAAE,KAAK,CAAC;IAC3B,QAAQ,CAAC,EAAE,KAAK,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,KAAK,CAAC;CACpB;;AAED,wBAAuE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-advanced-text",
-  "version": "0.1.29",
+  "version": "0.1.31",
   "description": " Advanced text component for React Native with custom select options.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/AdvancedTextViewNativeComponent.ts

@@ -1,26 +1,27 @@
-/* eslint-disable prettier/prettier */
-import type { ViewProps } from 'react-native';
-import { codegenNativeComponent } from 'react-native';
-// @ts-ignore
-import type { DirectEventHandler, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
-
-interface HighlightedWord {
-  index: Int32;
-  highlightColor: string;
-}
-
-export interface NativeProps extends ViewProps {
-  text: string;
-  highlightedWords?: ReadonlyArray<HighlightedWord>;
-  menuOptions?: ReadonlyArray<string>;
-  onWordPress?: DirectEventHandler<{ word: string; index: Int32 }>;
-  onSelection?: DirectEventHandler<{ selectedText: string; event: string }>;
-  indicatorWordIndex?: Int32;
-  fontSize?: Int32;
-  fontWeight?: string;
-  color?: string;
-  textAlign?: string;
-  fontFamily?: string;
-}
-
-export default codegenNativeComponent<NativeProps>('AdvancedTextView');
+/* eslint-disable prettier/prettier */
+import type { ViewProps } from 'react-native';
+import { codegenNativeComponent } from 'react-native';
+// @ts-ignore
+import type { DirectEventHandler, Int32 , Float  } from 'react-native/Libraries/Types/CodegenTypes';
+
+interface HighlightedWord {
+  index: Int32;
+  highlightColor: string;
+}
+
+export interface NativeProps extends ViewProps {
+  text: string;
+  highlightedWords?: ReadonlyArray<HighlightedWord>;
+  menuOptions?: ReadonlyArray<string>;
+  onWordPress?: DirectEventHandler<{ word: string; index: Int32 }>;
+  onSelection?: DirectEventHandler<{ selectedText: string; event: string }>;
+  indicatorWordIndex?: Int32;
+  fontSize?: Int32;
+  fontWeight?: string;
+  color?: string;
+  textAlign?: string;
+  fontFamily?: string;
+  lineHeight?: Float;
+}
+
+export default codegenNativeComponent<NativeProps>('AdvancedTextView');