@expensify/react-native-live-markdown 0.1.282 → 0.1.284

package/apple/MarkdownTextInputDecoratorComponentView.mm

@@ -28,6 +28,7 @@ using namespace facebook::react;
   MarkdownTextFieldObserver *_markdownTextFieldObserver;
   __weak RCTUITextView *_textView;
   __weak RCTUITextField *_textField;
+  bool _observersAdded;
 }
 
 + (ComponentDescriptorProvider)componentDescriptorProvider
@@ -46,6 +47,8 @@ using namespace facebook::react;
   if (self = [super initWithFrame:frame]) {
     static const auto defaultProps = std::make_shared<const MarkdownTextInputDecoratorViewProps>();
     _props = defaultProps;
+    _observersAdded = false;
+    _markdownUtils = [[RCTMarkdownUtils alloc] init];
   }
 
   return self;
@@ -53,13 +56,26 @@ using namespace facebook::react;
 
 - (void)didAddSubview:(UIView *)subview
 {
-  react_native_assert([subview isKindOfClass:[RCTTextInputComponentView class]] && "Child component of MarkdownTextInputDecoratorComponentView is not an instance of RCTTextInputComponentView.");
-  RCTTextInputComponentView *textInputComponentView = (RCTTextInputComponentView *)subview;
-  UIView<RCTBackedTextInputViewProtocol> *backedTextInputView = [textInputComponentView valueForKey:@"_backedTextInputView"];
+  [super didAddSubview:subview];
+  [self addTextInputObservers];
+}
 
-  _markdownUtils = [[RCTMarkdownUtils alloc] init];
-  [_markdownUtils setMarkdownStyle:_markdownStyle];
-  [_markdownUtils setParserId:_parserId];
+- (void)willRemoveSubview:(UIView *)subview
+{
+  [self removeTextInputObservers];
+  [super willRemoveSubview:subview];
+}
+
+- (void)addTextInputObservers
+{
+  react_native_assert(!_observersAdded && "MarkdownTextInputDecoratorComponentView tried to add TextInput observers while they were attached");
+  react_native_assert(self.subviews.count > 0 && "MarkdownTextInputDecoratorComponentView is mounted without any children")
+  UIView* childView = self.subviews[0];
+  react_native_assert([childView isKindOfClass:[RCTTextInputComponentView class]] && "Child component of MarkdownTextInputDecoratorComponentView is not an instance of RCTTextInputComponentView.");
+  RCTTextInputComponentView *textInputComponentView = (RCTTextInputComponentView *)childView;
+  UIView<RCTBackedTextInputViewProtocol> *backedTextInputView = [textInputComponentView valueForKey:@"_backedTextInputView"];
+ 
+  _observersAdded = true;
 
   if ([backedTextInputView isKindOfClass:[RCTUITextField class]]) {
     _textField = (RCTUITextField *)backedTextInputView;
@@ -115,11 +131,11 @@ using namespace facebook::react;
   }
 }
 
-- (void)willMoveToWindow:(UIWindow *)newWindow
+- (void)removeTextInputObservers
 {
-  if (newWindow != nil) {
-    return;
-  }
+  react_native_assert(_observersAdded && "MarkdownTextInputDecoratorComponentView tried to remove TextInput observers while they were detached");
+  _observersAdded = false;
+
   if (_textView != nil) {
     if (_textView.layoutManager != nil && [object_getClass(_textView.layoutManager) isEqual:[MarkdownLayoutManager class]]) {
       [_textView.layoutManager setValue:nil forKey:@"markdownUtils"];
@@ -173,6 +189,16 @@ using namespace facebook::react;
   }
 }
 
+- (void)prepareForRecycle
+{
+  react_native_assert(!_observersAdded && "MarkdownTextInputDecoratorComponentView was being recycled with TextInput observers still attached");
+  [super prepareForRecycle];
+  
+  static const auto defaultProps = std::make_shared<const MarkdownTextInputDecoratorViewProps>();
+  _props = defaultProps;
+  _markdownUtils = [[RCTMarkdownUtils alloc] init];
+}
+
 Class<RCTComponentViewProtocol> MarkdownTextInputDecoratorViewCls(void)
 {
   return MarkdownTextInputDecoratorComponentView.class;

package/package.json

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