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

package/apple/MarkdownBackedTextInputDelegate.h

@@ -0,0 +1,12 @@
+#import <React/RCTBackedTextInputDelegate.h>
+#import <React/RCTUITextView.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MarkdownBackedTextInputDelegate : NSObject <RCTBackedTextInputDelegate>
+
+- (instancetype)initWithTextView:(RCTUITextView *)textView;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/apple/MarkdownBackedTextInputDelegate.mm

@@ -0,0 +1,92 @@
+#import "MarkdownBackedTextInputDelegate.h"
+
+@implementation MarkdownBackedTextInputDelegate {
+  __weak RCTUITextView *_textView;
+  id<RCTBackedTextInputDelegate> _originalTextInputDelegate;
+}
+
+- (instancetype)initWithTextView:(RCTUITextView *)textView
+{
+  if (self = [super init]) {
+    _textView = textView;
+    _originalTextInputDelegate = _textView.textInputDelegate;
+    _textView.textInputDelegate = self;
+  }
+  return self;
+}
+
+- (void)dealloc
+{
+  // Restore original text input delegate
+  _textView.textInputDelegate = _originalTextInputDelegate;
+}
+
+- (void)textInputDidChangeSelection
+{
+  // Delegate the call to the original text input delegate
+  [_originalTextInputDelegate textInputDidChangeSelection];
+
+  // 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 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
+
+- (void)textInputDidChange
+{
+  [_originalTextInputDelegate textInputDidChange];
+}
+
+- (void)textInputDidBeginEditing
+{
+  [_originalTextInputDelegate textInputDidBeginEditing];
+}
+
+- (void)textInputDidEndEditing
+{
+  [_originalTextInputDelegate textInputDidEndEditing];
+}
+
+- (void)textInputDidReturn
+{
+  [_originalTextInputDelegate textInputDidReturn];
+}
+
+- (BOOL)textInputShouldBeginEditing
+{
+  return [_originalTextInputDelegate textInputShouldBeginEditing];
+}
+
+- (nonnull NSString *)textInputShouldChangeText:(nonnull NSString *)text inRange:(NSRange)range
+{
+  return [_originalTextInputDelegate textInputShouldChangeText:text inRange:range];
+}
+
+- (BOOL)textInputShouldEndEditing
+{
+  return [_originalTextInputDelegate textInputShouldEndEditing];
+}
+
+- (BOOL)textInputShouldReturn
+{
+  return [_originalTextInputDelegate textInputShouldReturn];
+}
+
+- (BOOL)textInputShouldSubmitOnReturn
+{
+  return [_originalTextInputDelegate textInputShouldSubmitOnReturn];
+}
+
+@end

package/apple/MarkdownTextInputDecoratorComponentView.mm

@@ -3,6 +3,7 @@
 #import <React/RCTFabricComponentsPlugins.h>
 #import <React/RCTUITextField.h>
 
+#import <RNLiveMarkdown/MarkdownBackedTextInputDelegate.h>
 #import <RNLiveMarkdown/MarkdownLayoutManager.h>
 #import <RNLiveMarkdown/MarkdownShadowFamilyRegistry.h>
 #import <RNLiveMarkdown/MarkdownTextInputDecoratorComponentView.h>
@@ -20,6 +21,7 @@ using namespace facebook::react;
   RCTMarkdownUtils *_markdownUtils;
   RCTMarkdownStyle *_markdownStyle;
   NSNumber *_parserId;
+  MarkdownBackedTextInputDelegate *_markdownBackedTextInputDelegate;
   __weak RCTTextInputComponentView *_textInput;
   __weak UIView<RCTBackedTextInputViewProtocol> *_backedTextInputView;
   __weak RCTBackedTextFieldDelegateAdapter *_adapter;
@@ -109,6 +111,9 @@ using namespace facebook::react;
     layoutManager.allowsNonContiguousLayout = NO; // workaround for onScroll issue
     object_setClass(layoutManager, [MarkdownLayoutManager class]);
     [layoutManager setValue:_markdownUtils forKey:@"markdownUtils"];
+
+    // register delegate for fixing cursor position after blockquote
+    _markdownBackedTextInputDelegate = [[MarkdownBackedTextInputDelegate alloc] initWithTextView:_textView];
   } else {
     react_native_assert(false && "Cannot enable Markdown for this type of TextInput.");
   }
@@ -123,6 +128,7 @@ using namespace facebook::react;
     [_adapter setMarkdownUtils:nil];
   }
   if (_textView != nil) {
+    _markdownBackedTextInputDelegate = nil;
     [_textView setMarkdownUtils:nil];
     if (_textView.layoutManager != nil && [object_getClass(_textView.layoutManager) isEqual:[MarkdownLayoutManager class]]) {
       [_textView.layoutManager setValue:nil forKey:@"markdownUtils"];

package/apple/RCTTextInputComponentView+Markdown.mm

@@ -44,6 +44,23 @@ using namespace expensify::livemarkdown;
 
   // Call the original method
   [self markdown__setAttributedString:attributedString];
+  
+  if (markdownUtils != nil && backedTextInputView != nil) {
+    // 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 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;
+    }
+  }
 }
 
 - (BOOL)markdown__textOf:(NSAttributedString *)newText equals:(NSAttributedString *)oldText

package/apple/RCTUITextView+Markdown.mm

@@ -19,7 +19,6 @@
     UITextRange *range = self.selectedTextRange;
     super.attributedText = [markdownUtils parseMarkdown:self.attributedText withDefaultTextAttributes:self.defaultTextAttributes];
     [super setSelectedTextRange:range]; // prevents cursor from jumping at the end when typing in the middle of the text
-    self.typingAttributes = self.defaultTextAttributes; // removes indent in new line when typing after blockquote
   }
 
   // Call the original method

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expensify/react-native-live-markdown",
-  "version": "0.1.251",
+  "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",