react-native-enriched 0.2.1 → 0.3.0

package/README.md

@@ -13,7 +13,7 @@
 
 `EnrichedTextInput`, the rich text editor component is an uncontrolled input. This means that it doesn't use any state or props to store its value, but instead directly interacts with the underlying platform-specific components. Thanks to this, the component is really performant and simple to use while offering complex and advanced features no other solution has.
 
-<https://github.com/user-attachments/assets/4778d541-d967-47e7-8013-6f7c436bcb95>
+![react-native-enriched-demo](https://github.com/user-attachments/assets/a2c968c0-9b85-492f-ac71-af64ef231fbf)
 
 Since 2012 [Software Mansion](https://swmansion.com) is a software agency with experience in building web and mobile apps. We are Core React Native Contributors and experts in dealing with all kinds of React Native issues.
 We can help you build your next dream product –
@@ -101,7 +101,7 @@ export default function App() {
     <View style={styles.container}>
       <EnrichedTextInput
         ref={ref}
-        onChangeState={e => setStylesState(e.nativeEvent)}
+        onChangeState={(e) => setStylesState(e.nativeEvent)}
         style={styles.input}
       />
       <Button
@@ -127,13 +127,16 @@ const styles = StyleSheet.create({
     backgroundColor: 'lightgray',
   },
 });
-
 ```
 
 Summary of what happens here:
 
 1. Any methods imperatively called on the input to e.g. toggle some style must be used through a `ref` of `EnrichedTextInputInstance` type. Here, `toggleBold` method that is called on the button press calls `ref.current?.toggleBold()`, which toggles the bold styling within the current selection.
-2. All the active styles info is emitted by `onChangeState` event. Set up a proper callback that accepts a `NativeSyntheticEvent<OnChangeStateEvent>` argument, and you can access an object with boolean properties indicating which styles are active, such as `isBold` in the example. Here, this info is stored in a React state and used to change colors on the button.
+2. All style state information is emitted by the `onChangeState` event. Set up a proper callback that accepts a `NativeSyntheticEvent<OnChangeStateEvent>` argument. The event payload provides a nested object for each style (e.g., `bold`, `italic`), containing three properties to guide your UI logic:
+
+- `isActive`: Indicates if the style is currently applied (highlight the button).
+- `isBlocking`: Indicates if the style is blocked by another active style (disable the button).
+- `isConflicting`: Indicates if the style is in conflict with another active style.
 
 ## Non Parametrized Styles
 
@@ -144,9 +147,7 @@ Supported styles:
 - underline
 - strikethrough
 - inline code
-- H1 heading
-- H2 heading
-- H3 heading
+- H1, H2, H3, H4, H5 and H6 headings
 - codeblock
 - blockquote
 - ordered list
@@ -158,8 +159,8 @@ Each call toggles the style within the current text selection. We can still divi
 
 - Inline styles (bold, italic, underline, strikethrough, inline code). They are being toggled on exactly the character range that is currently selected. When toggling the style with just the cursor in place (no selection), the style is ready to be used and will be applied to the next characters that the user inputs.
 
-- Paragraph styles (headings, codeblock, blockquote, lists). They are being toggled on the entire paragraph that the selection is in. By paragraph we mean a part of the text between two newlines (enters) or the text's beginning/ending.
-If the selection spans more than one paragraph, logically more of them will be affected by the toggle. Toggling these styles with the cursor in place (no selection) makes changes to the very paragraph the cursor is in.
+- Paragraph styles (headings, codeblock, blockquote, lists). They are being toggled on the entire paragraph that the selection is in. By paragraph, we mean a part of the text between two newlines (enters) or the text's beginning/ending.
+  If the selection spans more than one paragraph, logically more of them will be affected by the toggle. Toggling these styles with the cursor in place (no selection) makes changes to the very paragraph the cursor is in.
 
 ## Links
 
@@ -167,7 +168,8 @@ The links are here, just like in any other editor, a piece of text with a URL at
 
 ### Automatic links detection
 
-`react-native-enriched` automatically detects words that appear to be some URLs and makes them links. Currently, we are using pretty naive approach to detect whether text can be treated as a link or not. On iOS it's a pretty simple regex, on Android we are using URL regex provided by the system.
+`react-native-enriched` automatically detects words that appear to be some URLs and makes them links.
+You can customize this behavior by providing your own regular expression via [linkRegex](docs/API_REFERENCE.md#linkregex) prop.
 
 ### Applying links manually
 
@@ -226,10 +228,11 @@ You can find some examples in the [usage section](#usage) or in the example app.
 - [onChangeSelection](docs/API_REFERENCE.md#onchangeselection) - returns all the data needed for working with selections (as of now it's mainly useful for [links](#links)).
 - [onLinkDetected](docs/API_REFERENCE.md#onlinkdetected) - returns link's detailed info whenever user selection is near one.
 - [onMentionDetected](docs/API_REFERENCE.md#onmentiondetected) - returns mention's detailed info whenever user selection is near one.
+- [onKeyPress](docs/API_REFERENCE.md#onkeypress) - emits whenever a key is pressed. Follows react-native TextInput's onKeyPress event [spec](https://reactnative.dev/docs/textinput#onkeypress).
 
 ## Customizing \<EnrichedTextInput /> styles
 
-`react-native-enriched` allows customizing styles of the `<EnrichedTextInput />` component.  See [htmlStyle](docs/API_REFERENCE.md#htmlstyle) prop.
+`react-native-enriched` allows customizing styles of the `<EnrichedTextInput />` component. See [htmlStyle](docs/API_REFERENCE.md#htmlstyle) prop.
 
 ## API Reference
 
@@ -243,7 +246,6 @@ See the [API Reference](docs/API_REFERENCE.md) for a detailed overview of all th
 ## Future Plans
 
 - Creating `EnrichedText` text component that supports our HTML output format with all additional interactions like pressing links or mentions.
-- Adding API for custom link detection regex.
 - Web library implementation via `react-native-web`.
 
 ## Contributing
@@ -255,6 +257,7 @@ See the [contributing guide](CONTRIBUTING.md) to learn how to contribute to the
 `react-native-enriched` library is licensed under [The MIT License](./LICENSE).
 
 ---
+
 Built by [Software Mansion](https://swmansion.com/) and sponsored by [Filament](https://filament.dm/).
 
 [<img width="128" height="69" alt="Software Mansion Logo" src="https://github.com/user-attachments/assets/f0e18471-a7aa-4e80-86ac-87686a86fe56" />](https://swmansion.com/)

package/android/build.gradle

@@ -1,18 +1,21 @@
 buildscript {
-  ext.getExtOrDefault = {name ->
-    return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['EnrichedTextInput_' + name]
-  }
-
-  repositories {
-    google()
-    mavenCentral()
-  }
-
-  dependencies {
-    classpath "com.android.tools.build:gradle:8.7.2"
-    // noinspection DifferentKotlinGradleVersion
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${getExtOrDefault('kotlinVersion')}"
-  }
+	ext.getExtOrDefault = {name ->
+		return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['EnrichedTextInput_' + name]
+	}
+
+	repositories {
+		google()
+		mavenCentral()
+		gradlePluginPortal()
+	}
+
+	dependencies {
+		classpath "com.android.tools.build:gradle:8.7.2"
+		// noinspection DifferentKotlinGradleVersion
+		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${getExtOrDefault('kotlinVersion')}"
+		classpath "org.jlleitschuh.gradle:ktlint-gradle:14.0.1"
+		classpath 'com.diffplug.spotless:spotless-plugin-gradle:8.1.0'
+	}
 }
 
 
@@ -21,81 +24,83 @@ apply plugin: "kotlin-android"
 
 apply plugin: "com.facebook.react"
 
+apply from: "lint.gradle"
+
 def getExtOrIntegerDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["EnrichedTextInput_" + name]).toInteger()
+	return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["EnrichedTextInput_" + name]).toInteger()
 }
 
 def supportsNamespace() {
-  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
-  def major = parsed[0].toInteger()
-  def minor = parsed[1].toInteger()
+	def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+	def major = parsed[0].toInteger()
+	def minor = parsed[1].toInteger()
 
-  // Namespace support was added in 7.3.0
-  return (major == 7 && minor >= 3) || major >= 8
+	// Namespace support was added in 7.3.0
+	return (major == 7 && minor >= 3) || major >= 8
 }
 
 android {
-  if (supportsNamespace()) {
-    namespace "com.swmansion.enriched"
-
-    sourceSets {
-      main {
-        manifest.srcFile "src/main/AndroidManifestNew.xml"
-      }
-    }
-  }
-
-  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
-
-  defaultConfig {
-    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
-    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
-  }
-
-  buildFeatures {
-    buildConfig true
-  }
-
-  buildTypes {
-    release {
-      minifyEnabled false
-    }
-  }
-
-  lintOptions {
-    disable "GradleCompatible"
-  }
-
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
-  }
-
-  sourceSets {
-    main {
-      java.srcDirs += [
-        "generated/java",
-        "generated/jni"
-      ]
-    }
-  }
+	if (supportsNamespace()) {
+		namespace "com.swmansion.enriched"
+
+		sourceSets {
+			main {
+				manifest.srcFile "src/main/AndroidManifestNew.xml"
+			}
+		}
+	}
+
+	compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
+
+	defaultConfig {
+		minSdkVersion getExtOrIntegerDefault("minSdkVersion")
+		targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+	}
+
+	buildFeatures {
+		buildConfig true
+	}
+
+	buildTypes {
+		release {
+			minifyEnabled false
+		}
+	}
+
+	lintOptions {
+		disable "GradleCompatible"
+	}
+
+	compileOptions {
+		sourceCompatibility JavaVersion.VERSION_1_8
+		targetCompatibility JavaVersion.VERSION_1_8
+	}
+
+	sourceSets {
+		main {
+			java.srcDirs += [
+				"generated/java",
+				"generated/jni"
+			]
+		}
+	}
 }
 
 repositories {
-  mavenCentral()
-  google()
+	mavenCentral()
+	google()
 }
 
 def kotlin_version = getExtOrDefault("kotlinVersion")
 
 dependencies {
-  implementation "com.facebook.react:react-android"
-  implementation 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
-  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+	implementation "com.facebook.react:react-android"
+	implementation 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
+	implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
 react {
-  jsRootDir = file("../src/")
-  libraryName = "EnrichedTextInputView"
-  codegenJavaPackageName = "com.swmansion.enriched"
+	jsRootDir = file("../src/")
+	libraryName = "EnrichedTextInputView"
+	codegenJavaPackageName = "com.swmansion.enriched"
 }

package/android/generated/java/com/facebook/react/viewmanagers/EnrichedTextInputViewManagerDelegate.java

@@ -58,6 +58,9 @@ public class EnrichedTextInputViewManagerDelegate<T extends View, U extends Base
       case "scrollEnabled":
         mViewManager.setScrollEnabled(view, value == null ? false : (boolean) value);
         break;
+      case "linkRegex":
+        mViewManager.setLinkRegex(view, (ReadableMap) value);
+        break;
       case "color":
         mViewManager.setColor(view, ColorPropConverter.getColor(value, view.getContext()));
         break;
@@ -76,6 +79,9 @@ public class EnrichedTextInputViewManagerDelegate<T extends View, U extends Base
       case "isOnChangeHtmlSet":
         mViewManager.setIsOnChangeHtmlSet(view, value == null ? false : (boolean) value);
         break;
+      case "isOnChangeTextSet":
+        mViewManager.setIsOnChangeTextSet(view, value == null ? false : (boolean) value);
+        break;
       case "androidExperimentalSynchronousEvents":
         mViewManager.setAndroidExperimentalSynchronousEvents(view, value == null ? false : (boolean) value);
         break;
@@ -96,6 +102,9 @@ public class EnrichedTextInputViewManagerDelegate<T extends View, U extends Base
       case "setValue":
         mViewManager.setValue(view, args.getString(0));
         break;
+      case "setSelection":
+        mViewManager.setSelection(view, args.getInt(0), args.getInt(1));
+        break;
       case "toggleBold":
         mViewManager.toggleBold(view);
         break;
@@ -120,6 +129,15 @@ public class EnrichedTextInputViewManagerDelegate<T extends View, U extends Base
       case "toggleH3":
         mViewManager.toggleH3(view);
         break;
+      case "toggleH4":
+        mViewManager.toggleH4(view);
+        break;
+      case "toggleH5":
+        mViewManager.toggleH5(view);
+        break;
+      case "toggleH6":
+        mViewManager.toggleH6(view);
+        break;
       case "toggleCodeBlock":
         mViewManager.toggleCodeBlock(view);
         break;

package/android/generated/java/com/facebook/react/viewmanagers/EnrichedTextInputViewManagerInterface.java

@@ -27,16 +27,19 @@ public interface EnrichedTextInputViewManagerInterface<T extends View> extends V
   void setAutoCapitalize(T view, @Nullable String value);
   void setHtmlStyle(T view, @Nullable ReadableMap value);
   void setScrollEnabled(T view, boolean value);
+  void setLinkRegex(T view, @Nullable ReadableMap value);
   void setColor(T view, @Nullable Integer value);
   void setFontSize(T view, float value);
   void setFontFamily(T view, @Nullable String value);
   void setFontWeight(T view, @Nullable String value);
   void setFontStyle(T view, @Nullable String value);
   void setIsOnChangeHtmlSet(T view, boolean value);
+  void setIsOnChangeTextSet(T view, boolean value);
   void setAndroidExperimentalSynchronousEvents(T view, boolean value);
   void focus(T view);
   void blur(T view);
   void setValue(T view, String text);
+  void setSelection(T view, int start, int end);
   void toggleBold(T view);
   void toggleItalic(T view);
   void toggleUnderline(T view);
@@ -45,6 +48,9 @@ public interface EnrichedTextInputViewManagerInterface<T extends View> extends V
   void toggleH1(T view);
   void toggleH2(T view);
   void toggleH3(T view);
+  void toggleH4(T view);
+  void toggleH5(T view);
+  void toggleH6(T view);
   void toggleCodeBlock(T view);
   void toggleBlockQuote(T view);
   void toggleOrderedList(T view);

package/android/generated/jni/react/renderer/components/RNEnrichedTextInputViewSpec/EventEmitters.cpp

@@ -51,6 +51,140 @@ void EnrichedTextInputViewEventEmitter::onChangeHtml(OnChangeHtml event) const {
 
 void EnrichedTextInputViewEventEmitter::onChangeState(OnChangeState event) const {
   dispatchEvent("changeState", [event=std::move(event)](jsi::Runtime &runtime) {
+    auto payload = jsi::Object(runtime);
+    {
+  auto bold = jsi::Object(runtime);
+  bold.setProperty(runtime, "isActive", event.bold.isActive);
+  bold.setProperty(runtime, "isConflicting", event.bold.isConflicting);
+  bold.setProperty(runtime, "isBlocking", event.bold.isBlocking);
+  payload.setProperty(runtime, "bold", bold);
+}
+{
+  auto italic = jsi::Object(runtime);
+  italic.setProperty(runtime, "isActive", event.italic.isActive);
+  italic.setProperty(runtime, "isConflicting", event.italic.isConflicting);
+  italic.setProperty(runtime, "isBlocking", event.italic.isBlocking);
+  payload.setProperty(runtime, "italic", italic);
+}
+{
+  auto underline = jsi::Object(runtime);
+  underline.setProperty(runtime, "isActive", event.underline.isActive);
+  underline.setProperty(runtime, "isConflicting", event.underline.isConflicting);
+  underline.setProperty(runtime, "isBlocking", event.underline.isBlocking);
+  payload.setProperty(runtime, "underline", underline);
+}
+{
+  auto strikeThrough = jsi::Object(runtime);
+  strikeThrough.setProperty(runtime, "isActive", event.strikeThrough.isActive);
+  strikeThrough.setProperty(runtime, "isConflicting", event.strikeThrough.isConflicting);
+  strikeThrough.setProperty(runtime, "isBlocking", event.strikeThrough.isBlocking);
+  payload.setProperty(runtime, "strikeThrough", strikeThrough);
+}
+{
+  auto inlineCode = jsi::Object(runtime);
+  inlineCode.setProperty(runtime, "isActive", event.inlineCode.isActive);
+  inlineCode.setProperty(runtime, "isConflicting", event.inlineCode.isConflicting);
+  inlineCode.setProperty(runtime, "isBlocking", event.inlineCode.isBlocking);
+  payload.setProperty(runtime, "inlineCode", inlineCode);
+}
+{
+  auto h1 = jsi::Object(runtime);
+  h1.setProperty(runtime, "isActive", event.h1.isActive);
+  h1.setProperty(runtime, "isConflicting", event.h1.isConflicting);
+  h1.setProperty(runtime, "isBlocking", event.h1.isBlocking);
+  payload.setProperty(runtime, "h1", h1);
+}
+{
+  auto h2 = jsi::Object(runtime);
+  h2.setProperty(runtime, "isActive", event.h2.isActive);
+  h2.setProperty(runtime, "isConflicting", event.h2.isConflicting);
+  h2.setProperty(runtime, "isBlocking", event.h2.isBlocking);
+  payload.setProperty(runtime, "h2", h2);
+}
+{
+  auto h3 = jsi::Object(runtime);
+  h3.setProperty(runtime, "isActive", event.h3.isActive);
+  h3.setProperty(runtime, "isConflicting", event.h3.isConflicting);
+  h3.setProperty(runtime, "isBlocking", event.h3.isBlocking);
+  payload.setProperty(runtime, "h3", h3);
+}
+{
+  auto h4 = jsi::Object(runtime);
+  h4.setProperty(runtime, "isActive", event.h4.isActive);
+  h4.setProperty(runtime, "isConflicting", event.h4.isConflicting);
+  h4.setProperty(runtime, "isBlocking", event.h4.isBlocking);
+  payload.setProperty(runtime, "h4", h4);
+}
+{
+  auto h5 = jsi::Object(runtime);
+  h5.setProperty(runtime, "isActive", event.h5.isActive);
+  h5.setProperty(runtime, "isConflicting", event.h5.isConflicting);
+  h5.setProperty(runtime, "isBlocking", event.h5.isBlocking);
+  payload.setProperty(runtime, "h5", h5);
+}
+{
+  auto h6 = jsi::Object(runtime);
+  h6.setProperty(runtime, "isActive", event.h6.isActive);
+  h6.setProperty(runtime, "isConflicting", event.h6.isConflicting);
+  h6.setProperty(runtime, "isBlocking", event.h6.isBlocking);
+  payload.setProperty(runtime, "h6", h6);
+}
+{
+  auto codeBlock = jsi::Object(runtime);
+  codeBlock.setProperty(runtime, "isActive", event.codeBlock.isActive);
+  codeBlock.setProperty(runtime, "isConflicting", event.codeBlock.isConflicting);
+  codeBlock.setProperty(runtime, "isBlocking", event.codeBlock.isBlocking);
+  payload.setProperty(runtime, "codeBlock", codeBlock);
+}
+{
+  auto blockQuote = jsi::Object(runtime);
+  blockQuote.setProperty(runtime, "isActive", event.blockQuote.isActive);
+  blockQuote.setProperty(runtime, "isConflicting", event.blockQuote.isConflicting);
+  blockQuote.setProperty(runtime, "isBlocking", event.blockQuote.isBlocking);
+  payload.setProperty(runtime, "blockQuote", blockQuote);
+}
+{
+  auto orderedList = jsi::Object(runtime);
+  orderedList.setProperty(runtime, "isActive", event.orderedList.isActive);
+  orderedList.setProperty(runtime, "isConflicting", event.orderedList.isConflicting);
+  orderedList.setProperty(runtime, "isBlocking", event.orderedList.isBlocking);
+  payload.setProperty(runtime, "orderedList", orderedList);
+}
+{
+  auto unorderedList = jsi::Object(runtime);
+  unorderedList.setProperty(runtime, "isActive", event.unorderedList.isActive);
+  unorderedList.setProperty(runtime, "isConflicting", event.unorderedList.isConflicting);
+  unorderedList.setProperty(runtime, "isBlocking", event.unorderedList.isBlocking);
+  payload.setProperty(runtime, "unorderedList", unorderedList);
+}
+{
+  auto link = jsi::Object(runtime);
+  link.setProperty(runtime, "isActive", event.link.isActive);
+  link.setProperty(runtime, "isConflicting", event.link.isConflicting);
+  link.setProperty(runtime, "isBlocking", event.link.isBlocking);
+  payload.setProperty(runtime, "link", link);
+}
+{
+  auto image = jsi::Object(runtime);
+  image.setProperty(runtime, "isActive", event.image.isActive);
+  image.setProperty(runtime, "isConflicting", event.image.isConflicting);
+  image.setProperty(runtime, "isBlocking", event.image.isBlocking);
+  payload.setProperty(runtime, "image", image);
+}
+{
+  auto mention = jsi::Object(runtime);
+  mention.setProperty(runtime, "isActive", event.mention.isActive);
+  mention.setProperty(runtime, "isConflicting", event.mention.isConflicting);
+  mention.setProperty(runtime, "isBlocking", event.mention.isBlocking);
+  payload.setProperty(runtime, "mention", mention);
+}
+    return payload;
+  });
+}
+
+
+void EnrichedTextInputViewEventEmitter::onChangeStateDeprecated(OnChangeStateDeprecated event) const {
+  dispatchEvent("changeStateDeprecated", [event=std::move(event)](jsi::Runtime &runtime) {
     auto payload = jsi::Object(runtime);
     payload.setProperty(runtime, "isBold", event.isBold);
 payload.setProperty(runtime, "isItalic", event.isItalic);
@@ -60,6 +194,9 @@ payload.setProperty(runtime, "isInlineCode", event.isInlineCode);
 payload.setProperty(runtime, "isH1", event.isH1);
 payload.setProperty(runtime, "isH2", event.isH2);
 payload.setProperty(runtime, "isH3", event.isH3);
+payload.setProperty(runtime, "isH4", event.isH4);
+payload.setProperty(runtime, "isH5", event.isH5);
+payload.setProperty(runtime, "isH6", event.isH6);
 payload.setProperty(runtime, "isCodeBlock", event.isCodeBlock);
 payload.setProperty(runtime, "isBlockQuote", event.isBlockQuote);
 payload.setProperty(runtime, "isOrderedList", event.isOrderedList);
@@ -125,4 +262,13 @@ payload.setProperty(runtime, "html", jsi::valueFromDynamic(runtime, event.html))
   });
 }
 
+
+void EnrichedTextInputViewEventEmitter::onInputKeyPress(OnInputKeyPress event) const {
+  dispatchEvent("inputKeyPress", [event=std::move(event)](jsi::Runtime &runtime) {
+    auto payload = jsi::Object(runtime);
+    payload.setProperty(runtime, "key", event.key);
+    return payload;
+  });
+}
+
 } // namespace facebook::react