Merge branch 'main' into @tomekzaw/fix-ios-option-key-diacritics

Expensify · Feb 22, 2024 · f755217 · f755217
2 parents 642651c + 56b3ca8
commit f755217
Show file tree

Hide file tree

Showing 6 changed files with 129 additions and 1,209 deletions.
diff --git a/ios/RCTBaseTextInputView+Markdown.m b/ios/RCTBaseTextInputView+Markdown.m
@@ -27,10 +27,19 @@ - (void)markdown_updateLocalData
 {
   RCTMarkdownUtils *markdownUtils = [self getMarkdownUtils];
   if (markdownUtils != nil) {
-    UITextRange *range = self.backedTextInputView.selectedTextRange;
-    NSAttributedString *attributedText = [markdownUtils parseMarkdown:self.backedTextInputView.attributedText];
-    [self.backedTextInputView setAttributedText:attributedText];
-    [self.backedTextInputView setSelectedTextRange:range notifyDelegate:YES];
+    id<RCTBackedTextInputViewProtocol> backedTextInputView = self.backedTextInputView;
+    NSAttributedString *oldAttributedText = backedTextInputView.attributedText;
+    NSAttributedString *newAttributedText = [markdownUtils parseMarkdown:oldAttributedText];
+    UITextRange *range = backedTextInputView.selectedTextRange;
+
+    // update attributed text without emitting onSelectionChange event
+    id<RCTBackedTextInputDelegate> delegate = backedTextInputView.textInputDelegate;
+    backedTextInputView.textInputDelegate = nil;
+    [backedTextInputView setAttributedText:newAttributedText];
+    backedTextInputView.textInputDelegate = delegate;
+
+    // restore original selection and emit onSelectionChange event
+    [backedTextInputView setSelectedTextRange:range notifyDelegate:YES];
   }
 
   // Call the original method

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@expensify/react-native-live-markdown",
-  "version": "0.1.5",
+  "version": "0.1.12",
   "description": "Drop-in replacement for React Native's TextInput component with Markdown formatting.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",