Improve performance on iOS

Expensify · May 27, 2024 · 5e5985a · 5e5985a
1 parent 377ab57
commit 5e5985a
Show file tree

Hide file tree

Showing 11 changed files with 224 additions and 260 deletions.
diff --git a/ios/MarkdownTextInputDecoratorView.mm b/ios/MarkdownTextInputDecoratorView.mm
@@ -3,7 +3,6 @@
 
 #import <RNLiveMarkdown/MarkdownLayoutManager.h>
 #import <RNLiveMarkdown/MarkdownTextInputDecoratorView.h>
-#import <RNLiveMarkdown/RCTBackedTextFieldDelegateAdapter+Markdown.h>
 #import <RNLiveMarkdown/RCTUITextView+Markdown.h>
 
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -23,7 +22,6 @@ @implementation MarkdownTextInputDecoratorView {
   __weak RCTBaseTextInputView *_textInput;
 #endif /* RCT_NEW_ARCH_ENABLED */
   __weak UIView<RCTBackedTextInputViewProtocol> *_backedTextInputView;
-  __weak RCTBackedTextFieldDelegateAdapter *_adapter;
   __weak RCTUITextView *_textView;
 }
 
@@ -65,9 +63,7 @@ - (void)didMoveToWindow {
 
   [_textInput setMarkdownUtils:_markdownUtils];
   if ([_backedTextInputView isKindOfClass:[RCTUITextField class]]) {
-    RCTUITextField *textField = (RCTUITextField *)_backedTextInputView;
-    _adapter = [textField valueForKey:@"textInputDelegateAdapter"];
-    [_adapter setMarkdownUtils:_markdownUtils];
+    // Do nothing
   } else if ([_backedTextInputView isKindOfClass:[RCTUITextView class]]) {
     _textView = (RCTUITextView *)_backedTextInputView;
     [_textView setMarkdownUtils:_markdownUtils];
@@ -85,9 +81,6 @@ - (void)willMoveToWindow:(UIWindow *)newWindow
   if (_textInput != nil) {
     [_textInput setMarkdownUtils:nil];
   }
-  if (_adapter != nil) {
-    [_adapter setMarkdownUtils:nil];
-  }
   if (_textView != nil) {
     [_textView setMarkdownUtils:nil];
     if (_textView.layoutManager != nil && [object_getClass(_textView.layoutManager) isEqual:[MarkdownLayoutManager class]]) {
@@ -103,11 +96,17 @@ - (void)setMarkdownStyle:(RCTMarkdownStyle *)markdownStyle
   [_markdownUtils setMarkdownStyle:markdownStyle];
 
   // apply new styles
+  if (_textView != nil) {
+    // We want to use `textStorage` for applying markdown when possible. Currently it's only available for UITextView
+    [_textView textDidChange];
+  } else {
+    // Set attributed string for all other types of views
 #ifdef RCT_NEW_ARCH_ENABLED
-  [_textInput _setAttributedString:_backedTextInputView.attributedText];
+    [_textInput _setAttributedString:_backedTextInputView.attributedText];
 #else
-  [_textInput setAttributedText:_textInput.attributedText];
+    [_textInput setAttributedText:_textInput.attributedText];
 #endif /* RCT_NEW_ARCH_ENABLED */
+  }
 }
 
 @end
diff --git a/ios/RCTBackedTextFieldDelegateAdapter+Markdown.h b/ios/RCTBackedTextFieldDelegateAdapter+Markdown.h
diff --git a/ios/RCTBackedTextFieldDelegateAdapter+Markdown.mm b/ios/RCTBackedTextFieldDelegateAdapter+Markdown.mm
diff --git a/ios/RCTBaseTextInputView+Markdown.h b/ios/RCTBaseTextInputView+Markdown.h
@@ -1,8 +1,15 @@
+// This guard prevent this file to be compiled in the new architecture.
+#ifndef RCT_NEW_ARCH_ENABLED
+
 #import <React/RCTBaseTextInputView.h>
 #import <RNLiveMarkdown/RCTMarkdownUtils.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
+@interface RCTBaseTextInputView (Private)
+- (BOOL)textOf:(NSAttributedString *)newText equals:(NSAttributedString *)oldText;
+@end
+
 @interface RCTBaseTextInputView (Markdown)
 
 @property(nonatomic, nullable, getter=getMarkdownUtils) RCTMarkdownUtils *markdownUtils;
@@ -11,8 +18,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (BOOL)markdown_textOf:(NSAttributedString *)newText equals:(NSAttributedString *)oldText;
 
-- (void)markdown_updateLocalData;
-
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif /* RCT_NEW_ARCH_ENABLED */
diff --git a/ios/RCTBaseTextInputView+Markdown.mm b/ios/RCTBaseTextInputView+Markdown.mm
@@ -1,3 +1,8 @@
+// This guard prevent this file to be compiled in the new architecture.
+#ifndef RCT_NEW_ARCH_ENABLED
+
+#import <React/RCTUITextField.h>
+#import <RNLiveMarkdown/RCTUITextView+Markdown.h>
 #import <RNLiveMarkdown/RCTBaseTextInputView+Markdown.h>
 #import <RNLiveMarkdown/RCTMarkdownUtils.h>
 #import <objc/message.h>
@@ -14,9 +19,11 @@ - (RCTMarkdownUtils *)getMarkdownUtils {
 
 - (void)markdown_setAttributedText:(NSAttributedString *)attributedText
 {
-  RCTMarkdownUtils *markdownUtils = [self getMarkdownUtils];
-  if (markdownUtils != nil) {
-    attributedText = [markdownUtils parseMarkdown:attributedText withAttributes:self.backedTextInputView.defaultTextAttributes];
+  if (![self.backedTextInputView isKindOfClass:[RCTUITextView class]]) {
+    RCTMarkdownUtils *markdownUtils = [self getMarkdownUtils];
+    if (markdownUtils != nil) {
+      attributedText = [markdownUtils parseMarkdown:attributedText withAttributes:self.backedTextInputView.defaultTextAttributes];
+    }
   }
 
   // Call the original method
@@ -33,29 +40,6 @@ - (BOOL)markdown_textOf:(NSAttributedString *)newText equals:(NSAttributedString
   return [self markdown_textOf:newText equals:oldText];
 }
 
-- (void)markdown_updateLocalData
-{
-  RCTMarkdownUtils *markdownUtils = [self getMarkdownUtils];
-  if (markdownUtils != nil) {
-    id<RCTBackedTextInputViewProtocol> backedTextInputView = self.backedTextInputView;
-    NSAttributedString *oldAttributedText = backedTextInputView.attributedText;
-    NSAttributedString *newAttributedText = [markdownUtils parseMarkdown:oldAttributedText withAttributes:backedTextInputView.defaultTextAttributes];
-    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
-  [self markdown_updateLocalData];
-}
-
 + (void)load
 {
   static dispatch_once_t onceToken;
@@ -71,15 +55,6 @@ + (void)load
       method_exchangeImplementations(originalMethod, swizzledMethod);
     }
 
-    {
-      // swizzle updateLocalData
-      SEL originalSelector = @selector(updateLocalData);
-      SEL swizzledSelector = @selector(markdown_updateLocalData);
-      Method originalMethod = class_getInstanceMethod(cls, originalSelector);
-      Method swizzledMethod = class_getInstanceMethod(cls, swizzledSelector);
-      method_exchangeImplementations(originalMethod, swizzledMethod);
-    }
-
     {
       // swizzle textOf
       SEL originalSelector = @selector(textOf:equals:);
@@ -92,3 +67,5 @@ + (void)load
 }
 
 @end
+
+#endif /* RCT_NEW_ARCH_ENABLED */
diff --git a/ios/RCTMarkdownUtils.h b/ios/RCTMarkdownUtils.h
@@ -9,6 +9,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic) NSMutableArray<NSDictionary *> *blockquoteRangesAndLevels;
 
 - (NSAttributedString *)parseMarkdown:(nullable NSAttributedString *)input withAttributes:(nullable NSDictionary<NSAttributedStringKey, id>*)attributes;
+- (void)parseMarkdown:(nullable NSMutableAttributedString *)attributedString;
 
 @end