react-native-advanced-text 0.1.17 → 0.1.18

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

@@ -1,95 +1,122 @@
-// File: AdvancedTextViewManager.kt
-// This should be the ONLY content in this file
-package com.advancedtext
-
-import android.view.ViewGroup
-import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.module.annotations.ReactModule
-import com.facebook.react.uimanager.SimpleViewManager
-import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.ViewManagerDelegate
-import com.facebook.react.uimanager.annotations.ReactProp
-import com.facebook.react.viewmanagers.AdvancedTextViewManagerInterface
-import com.facebook.react.viewmanagers.AdvancedTextViewManagerDelegate
-
-@ReactModule(name = AdvancedTextViewManager.NAME)
-class AdvancedTextViewManager : SimpleViewManager<AdvancedTextView>(),
-    AdvancedTextViewManagerInterface<AdvancedTextView> {
-    private val mDelegate: ViewManagerDelegate<AdvancedTextView>
-
-    init {
-        mDelegate = AdvancedTextViewManagerDelegate(this)
-    }
-
-    override fun getDelegate(): ViewManagerDelegate<AdvancedTextView>? {
-        return mDelegate
-    }
-
-    override fun getName(): String {
-        return NAME
-    }
-
-    public override fun createViewInstance(context: ThemedReactContext): AdvancedTextView {
-        val view = AdvancedTextView(context)
-        // Set default layout params to ensure the view is visible
-        view.layoutParams = ViewGroup.LayoutParams(
-            ViewGroup.LayoutParams.MATCH_PARENT,
-            ViewGroup.LayoutParams.WRAP_CONTENT
-        )
-        return view
-    }
-
-    @ReactProp(name = "text")
-    override fun setText(view: AdvancedTextView?, text: String?) {
-        view?.setAdvancedText(text ?: "")
-    }
-
-    @ReactProp(name = "highlightedWords")
-    override fun setHighlightedWords(view: AdvancedTextView?, highlightedWords: ReadableArray?) {
-        val words = mutableListOf<HighlightedWord>()
-        highlightedWords?.let {
-            for (i in 0 until it.size()) {
-                val map = it.getMap(i)
-                map?.let { wordMap ->
-                    words.add(
-                        HighlightedWord(
-                            index = wordMap.getInt("index"),
-                            highlightColor = wordMap.getString("highlightColor") ?: "#FFFF00"
-                        )
-                    )
-                }
-            }
-        }
-        view?.setHighlightedWords(words)
-    }
-
-    @ReactProp(name = "menuOptions")
-    override fun setMenuOptions(view: AdvancedTextView?, menuOptions: ReadableArray?) {
-        val options = mutableListOf<String>()
-        menuOptions?.let {
-            for (i in 0 until it.size()) {
-                it.getString(i)?.let { option ->
-                    options.add(option)
-                }
-            }
-        }
-        view?.setMenuOptions(options)
-    }
-
-    @ReactProp(name = "indicatorWordIndex")
-    override fun setIndicatorWordIndex(view: AdvancedTextView?, index: Int) {
-        view?.setIndicatorWordIndex(index)
-    }
-
-    // Add this method to register custom events
-    override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any> {
-        return mapOf(
-            "onWordPress" to mapOf("registrationName" to "onWordPress"),
-            "onSelection" to mapOf("registrationName" to "onSelection")
-        )
-    }
-
-    companion object {
-        const val NAME = "AdvancedTextView"
-    }
-}
+// File: AdvancedTextViewManager.kt
+package com.advancedtext
+
+import android.graphics.Color
+import android.util.TypedValue
+import android.view.ViewGroup
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.SimpleViewManager
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.AdvancedTextViewManagerInterface
+import com.facebook.react.viewmanagers.AdvancedTextViewManagerDelegate
+import com.facebook.react.uimanager.PixelUtil
+
+@ReactModule(name = AdvancedTextViewManager.NAME)
+class AdvancedTextViewManager : SimpleViewManager<AdvancedTextView>(),
+    AdvancedTextViewManagerInterface<AdvancedTextView> {
+
+    private val mDelegate: ViewManagerDelegate<AdvancedTextView>
+
+    init {
+        mDelegate = AdvancedTextViewManagerDelegate(this)
+    }
+
+    override fun getDelegate(): ViewManagerDelegate<AdvancedTextView>? {
+        return mDelegate
+    }
+
+    override fun getName(): String {
+        return NAME
+    }
+
+    public override fun createViewInstance(context: ThemedReactContext): AdvancedTextView {
+        val view = AdvancedTextView(context)
+        view.layoutParams = ViewGroup.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.WRAP_CONTENT
+        )
+        // Set default text color to black to ensure visibility
+        view.setTextColor(Color.BLACK)
+        return view
+    }
+
+    @ReactProp(name = "text")
+    override fun setText(view: AdvancedTextView?, text: String?) {
+        android.util.Log.d("AdvancedTextViewManager", "setText called with: '$text'")
+        view?.setAdvancedText(text ?: "")
+    }
+
+    @ReactProp(name = "highlightedWords")
+    override fun setHighlightedWords(view: AdvancedTextView?, highlightedWords: ReadableArray?) {
+        if (highlightedWords == null) {
+            view?.setHighlightedWords(emptyList())
+            return
+        }
+
+        val words = mutableListOf<HighlightedWord>()
+        for (i in 0 until highlightedWords.size()) {
+            val map = highlightedWords.getMap(i)
+            map?.let { wordMap ->
+                if (wordMap.hasKey("index") && wordMap.hasKey("highlightColor")) {
+                    words.add(
+                        HighlightedWord(
+                            index = wordMap.getInt("index"),
+                            highlightColor = wordMap.getString("highlightColor") ?: "#FFFF00"
+                        )
+                    )
+                }
+            }
+        }
+        view?.setHighlightedWords(words)
+    }
+
+    @ReactProp(name = "menuOptions")
+    override fun setMenuOptions(view: AdvancedTextView?, menuOptions: ReadableArray?) {
+        if (menuOptions == null) {
+            view?.setMenuOptions(emptyList())
+            return
+        }
+
+        val options = mutableListOf<String>()
+        for (i in 0 until menuOptions.size()) {
+            menuOptions.getString(i)?.let { option ->
+                options.add(option)
+            }
+        }
+        view?.setMenuOptions(options)
+    }
+
+    @ReactProp(name = "indicatorWordIndex")
+    override fun setIndicatorWordIndex(view: AdvancedTextView?, index: Int) {
+        view?.setIndicatorWordIndex(if (index >= 0) index else -1)
+    }
+
+    @ReactProp(name = "color", customType = "Color")
+    fun setColor(view: AdvancedTextView?, color: Int?) {
+        android.util.Log.d("AdvancedTextViewManager", "setColor called with: $color")
+        view?.setTextColor(color ?: Color.BLACK)
+    }
+
+    @ReactProp(name = "fontSize")
+    fun setFontSize(view: AdvancedTextView?, fontSize: Float) {
+        android.util.Log.d("AdvancedTextViewManager", "setFontSize called with: $fontSize")
+        if (fontSize > 0) {
+            // Convert from React Native points to Android pixels
+            view?.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSize)
+        }
+    }
+
+    override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any> {
+        return mapOf(
+            "onWordPress" to mapOf("registrationName" to "onWordPress"),
+            "onSelection" to mapOf("registrationName" to "onSelection")
+        )
+    }
+
+    companion object {
+        const val NAME = "AdvancedTextView"
+    }
+}

package/lib/module/AdvancedText.js

@@ -1,16 +1,21 @@
 "use strict";
 
+import React from 'react';
 import AdvancedTextViewNativeComponent from './AdvancedTextViewNativeComponent';
 import { jsx as _jsx } from "react/jsx-runtime";
 export const AdvancedText = ({
   text,
+  style,
   highlightedWords,
   menuOptions,
   onWordPress,
   onSelection,
-  indicatorWordIndex
+  indicatorWordIndex,
+  ...restProps
 }) => {
   return /*#__PURE__*/_jsx(AdvancedTextViewNativeComponent, {
+    ...restProps,
+    style: style,
     text: text,
     highlightedWords: highlightedWords,
     menuOptions: menuOptions,

package/lib/module/AdvancedText.js.map

@@ -1 +1 @@
-{"version":3,"names":["AdvancedTextViewNativeComponent","jsx","_jsx","AdvancedText","text","highlightedWords","menuOptions","onWordPress","onSelection","indicatorWordIndex"],"sourceRoot":"..\\..\\src","sources":["AdvancedText.tsx"],"mappings":";;AACA,OAAOA,+BAA+B,MAAM,mCAAmC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAqBhF,OAAO,MAAMC,YAAmC,GAAGA,CAAC;EAClDC,IAAI;EACJC,gBAAgB;EAChBC,WAAW;EACXC,WAAW;EACXC,WAAW;EACXC;AACF,CAAC,KAAK;EACJ,oBACEP,IAAA,CAACF,+BAA+B;IAC9BI,IAAI,EAAEA,IAAK;IACXC,gBAAgB,EAAEA,gBAAiB;IACnCC,WAAW,EAAEA,WAAY;IACzBC,WAAW,EAAEA,WAAY;IACzBC,WAAW,EAAEA,WAAY;IACzBC,kBAAkB,EAAEA;EAAmB,CACxC,CAAC;AAEN,CAAC","ignoreList":[]}
+{"version":3,"names":["React","AdvancedTextViewNativeComponent","jsx","_jsx","AdvancedText","text","style","highlightedWords","menuOptions","onWordPress","onSelection","indicatorWordIndex","restProps"],"sourceRoot":"..\\..\\src","sources":["AdvancedText.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AAOzB,OAAOC,+BAA+B,MAAM,mCAAmC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AA2BhF,OAAO,MAAMC,YAAmC,GAAGA,CAAC;EAClDC,IAAI;EACJC,KAAK;EACLC,gBAAgB;EAChBC,WAAW;EACXC,WAAW;EACXC,WAAW;EACXC,kBAAkB;EAClB,GAAGC;AACL,CAAC,KAAK;EACJ,oBACET,IAAA,CAACF,+BAA+B;IAAA,GAC1BW,SAAS;IACbN,KAAK,EAAEA,KAAM;IACbD,IAAI,EAAEA,IAAK;IACXE,gBAAgB,EAAEA,gBAAiB;IACnCC,WAAW,EAAEA,WAAY;IACzBC,WAAW,EAAEA,WAAY;IACzBC,WAAW,EAAEA,WAAY;IACzBC,kBAAkB,EAAEA;EAAmB,CACxC,CAAC;AAEN,CAAC","ignoreList":[]}

package/lib/module/AdvancedTextViewNativeComponent.ts

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

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

@@ -1,20 +1,24 @@
-import type { NativeSyntheticEvent, ViewProps } from 'react-native';
+import React from 'react';
+import type { NativeSyntheticEvent, StyleProp, ViewProps, ViewStyle } from 'react-native';
 interface HighlightedWord {
     index: number;
     highlightColor: string;
 }
+interface WordPressEvent {
+    word: string;
+    index: number;
+}
+interface SelectionEvent {
+    selectedText: string;
+    event: string;
+}
 interface NativeProps extends ViewProps {
     text: string;
+    style?: StyleProp<ViewStyle>;
     highlightedWords?: ReadonlyArray<HighlightedWord>;
     menuOptions?: ReadonlyArray<string>;
-    onWordPress?: (event: NativeSyntheticEvent<{
-        word: string;
-        index: string;
-    }>) => void;
-    onSelection?: (event: NativeSyntheticEvent<{
-        selectedText: string;
-        event: string;
-    }>) => void;
+    onWordPress?: (event: NativeSyntheticEvent<WordPressEvent>) => void;
+    onSelection?: (event: NativeSyntheticEvent<SelectionEvent>) => void;
     indicatorWordIndex?: number;
 }
 export declare const AdvancedText: React.FC<NativeProps>;

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

@@ -1 +1 @@
-{"version":3,"file":"AdvancedText.d.ts","sourceRoot":"","sources":["../../../src/AdvancedText.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGpE,UAAU,eAAe;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,UAAU,WAAY,SAAQ,SAAS;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IAElD,WAAW,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACpC,WAAW,CAAC,EAAE,CACZ,KAAK,EAAE,oBAAoB,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,KACzD,IAAI,CAAC;IACV,WAAW,CAAC,EAAE,CACZ,KAAK,EAAE,oBAAoB,CAAC;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,KACjE,IAAI,CAAC;IACV,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CAkB9C,CAAC"}
+{"version":3,"file":"AdvancedText.d.ts","sourceRoot":"","sources":["../../../src/AdvancedText.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EACV,oBAAoB,EACpB,SAAS,EACT,SAAS,EACT,SAAS,EACV,MAAM,cAAc,CAAC;AAGtB,UAAU,eAAe;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,UAAU,cAAc;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,UAAU,cAAc;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,UAAU,WAAY,SAAQ,SAAS;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,gBAAgB,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IAClD,WAAW,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACpC,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,CAAC,cAAc,CAAC,KAAK,IAAI,CAAC;IACpE,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,CAAC,cAAc,CAAC,KAAK,IAAI,CAAC;IACpE,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CAsB9C,CAAC"}

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, Float, Int32 } from 'react-native/Libraries/Types/CodegenTypes';
 interface HighlightedWord {
     index: Int32;
     highlightColor: string;
@@ -10,12 +10,15 @@ interface NativeProps extends ViewProps {
     menuOptions?: ReadonlyArray<string>;
     onWordPress?: DirectEventHandler<{
         word: string;
+        index: Int32;
     }>;
     onSelection?: DirectEventHandler<{
         selectedText: string;
-        eventType: string;
+        event: string;
     }>;
     indicatorWordIndex?: Int32;
+    color?: Int32;
+    fontSize?: 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":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAI9C,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,UAAU,WAAY,SAAQ,SAAS;IACrC,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,CAAA;KAAE,CAAC,CAAC;IACnD,WAAW,CAAC,EAAE,kBAAkB,CAAC;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC9E,kBAAkB,CAAC,EAAE,KAAK,CAAC;CAC5B;;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,EAAE,KAAK,EAAC,MAAM,2CAA2C,CAAC;AAEjG,UAAU,eAAe;IACvB,KAAK,EAAE,KAAK,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,UAAU,WAAY,SAAQ,SAAS;IACrC,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,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,QAAQ,CAAC,EAAE,KAAK,CAAC;CAClB;;AAED,wBAAuE"}