@expensify/react-native-live-markdown 0.1.252 → 0.1.253

package/apple/MarkdownBackedTextInputDelegate.mm

@@ -29,10 +29,17 @@
   // After adding a newline at the end of the blockquote, the typing attributes in the next line still contain
   // NSParagraphStyle with non-zero firstLineHeadIndent and headIntent added by `_updateTypingAttributes` call.
   // This causes the cursor to be shifted to the right instead of being located at the beginning of the line.
-  // The following code removes NSParagraphStyle from typing attributes to fix the position of the cursor.
-  NSMutableDictionary *typingAttributes = [_textView.typingAttributes mutableCopy];
-  [typingAttributes removeObjectForKey:NSParagraphStyleAttributeName];
-  _textView.typingAttributes = typingAttributes;
+  // The following code resets firstLineHeadIndent and headIndent in NSParagraphStyle in typing attributes
+  // in order to fix the position of the cursor.
+  NSDictionary<NSAttributedStringKey, id> *typingAttributes = _textView.typingAttributes;
+  if (typingAttributes[NSParagraphStyleAttributeName] != nil) {
+    NSMutableDictionary *mutableTypingAttributes = [typingAttributes mutableCopy];
+    NSMutableParagraphStyle *mutableParagraphStyle = [typingAttributes[NSParagraphStyleAttributeName] mutableCopy];
+    mutableParagraphStyle.firstLineHeadIndent = 0;
+    mutableParagraphStyle.headIndent = 0;
+    mutableTypingAttributes[NSParagraphStyleAttributeName] = mutableParagraphStyle;
+    _textView.typingAttributes = mutableTypingAttributes;
+  }
 }
 
 // Delegate all remaining calls to the original text input delegate

package/apple/RCTTextInputComponentView+Markdown.mm

@@ -49,10 +49,17 @@ using namespace expensify::livemarkdown;
     // After adding a newline at the end of the blockquote, the typing attributes in the next line still contain
     // NSParagraphStyle with non-zero firstLineHeadIndent and headIntent added by `_updateTypingAttributes` call.
     // This causes the cursor to be shifted to the right instead of being located at the beginning of the line.
-    // The following code removes NSParagraphStyle from typing attributes to fix the position of the cursor.
-    NSMutableDictionary *typingAttributes = [backedTextInputView.typingAttributes mutableCopy];
-    [typingAttributes removeObjectForKey:NSParagraphStyleAttributeName];
-    backedTextInputView.typingAttributes = typingAttributes;
+    // The following code resets firstLineHeadIndent and headIndent in NSParagraphStyle in typing attributes
+    // in order to fix the position of the cursor.
+    NSDictionary<NSAttributedStringKey, id> *typingAttributes = backedTextInputView.typingAttributes;
+    if (typingAttributes[NSParagraphStyleAttributeName] != nil) {
+      NSMutableDictionary *mutableTypingAttributes = [typingAttributes mutableCopy];
+      NSMutableParagraphStyle *mutableParagraphStyle = [typingAttributes[NSParagraphStyleAttributeName] mutableCopy];
+      mutableParagraphStyle.firstLineHeadIndent = 0;
+      mutableParagraphStyle.headIndent = 0;
+      mutableTypingAttributes[NSParagraphStyleAttributeName] = mutableParagraphStyle;
+      backedTextInputView.typingAttributes = mutableTypingAttributes;
+    }
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expensify/react-native-live-markdown",
-  "version": "0.1.252",
+  "version": "0.1.253",
   "description": "Drop-in replacement for React Native's TextInput component with Markdown formatting.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",