@expensify/react-native-live-markdown 0.1.244 → 0.1.246

package/README.md

@@ -8,7 +8,7 @@
 - 🔧 Customizable logic
 - 🎨 Customizable styles
 - 🌐 Universal support (Android, iOS, web)
-- 🏗️ Supports New Architecture
+- 🏗️ Supports only the New Architecture
 
 ## Installation
 
@@ -179,7 +179,7 @@ Currently, `react-native-live-markdown` supports only [ExpensiMark](https://gith
 
 ## Compatibility
 
-`react-native-live-markdown` supports two latest React Native minor releases.
+`react-native-live-markdown` supports two latest React Native minor releases with the New Architecture enabled.
 
 | react-native | @expensify/react-native-live-markdown |
 | :----------: | :-----------------------------------: |

package/RNLiveMarkdown.podspec

@@ -36,7 +36,7 @@ Pod::Spec.new do |s|
 
   install_modules_dependencies(s)
 
-  if ENV['USE_FRAMEWORKS'] != nil && ENV['RCT_NEW_ARCH_ENABLED'] == '1'
+  if ENV['USE_FRAMEWORKS'] != nil
     add_dependency(s, "React-FabricComponents", :additional_framework_paths => [
       "react/renderer/textlayoutmanager/platform/ios",
       "react/renderer/components/textinput/platform/ios",
@@ -44,10 +44,8 @@ Pod::Spec.new do |s|
     add_dependency(s, "React-rendererconsistency")
   end
 
-  if ENV['RCT_NEW_ARCH_ENABLED'] == '1'
-    s.subspec "newarch" do |ss|
-      ss.source_files         = "cpp/**/*.{cpp,h}"
-      ss.header_dir           = "RNLiveMarkdown"
-    end
+  s.subspec "newarch" do |ss|
+    ss.source_files         = "cpp/**/*.{cpp,h}"
+    ss.header_dir           = "RNLiveMarkdown"
   end
 end

package/android/build.gradle

@@ -18,15 +18,8 @@ def reactNativeArchitectures() {
   return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
 }
 
-def isNewArchitectureEnabled() {
-  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
-}
-
 apply plugin: "com.android.library"
-
-if (isNewArchitectureEnabled()) {
-  apply plugin: "com.facebook.react"
-}
+apply plugin: "com.facebook.react"
 
 def getExtOrDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["LiveMarkdown_" + name]
@@ -93,7 +86,6 @@ android {
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
 
     buildConfigField "int", "REACT_NATIVE_MINOR_VERSION", REACT_NATIVE_MINOR_VERSION.toString()
-    buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
     consumerProguardFiles "proguard-rules.pro"
 
@@ -129,15 +121,10 @@ android {
 
   sourceSets {
     main {
-      if (isNewArchitectureEnabled()) {
-        java.srcDirs += [
-          "src/newarch",
-          // This is needed to build Kotlin project with NewArch enabled
-          "${project.buildDir}/generated/source/codegen/java"
-        ]
-      } else {
-        java.srcDirs += ["src/oldarch"]
-      }
+      java.srcDirs += [
+        // This is needed to build Kotlin project with NewArch enabled
+        "${project.buildDir}/generated/source/codegen/java"
+      ]
 
       // TextLayoutManager
       if (REACT_NATIVE_MINOR_VERSION <= 76 ) {
@@ -190,14 +177,6 @@ dependencies {
   implementation project(":react-native-reanimated")
 }
 
-if (isNewArchitectureEnabled()) {
-  react {
-    jsRootDir = file("../src/")
-    libraryName = "LiveMarkdown"
-    codegenJavaPackageName = "com.expensify.livemarkdown"
-  }
-}
-
 // This fixes linking errors due to undefined symbols from libworklets.so.
 // During Gradle Sync, Android Gradle Plugin runs Prefab and treats worklets
 // like a header-only library. During build, config files are not regenerated

package/android/src/main/java/com/expensify/livemarkdown/LiveMarkdownModule.java

@@ -22,11 +22,9 @@ public class LiveMarkdownModule extends NativeLiveMarkdownModuleSpec {
 
   @Override
   public boolean install() {
-    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-      FabricUIManager uiManager =
-        (FabricUIManager) UIManagerHelper.getUIManager(getReactApplicationContext(), UIManagerType.FABRIC);
-      mNativeProxy.createCommitHook(uiManager);
-    }
+    FabricUIManager uiManager =
+      (FabricUIManager) UIManagerHelper.getUIManager(getReactApplicationContext(), UIManagerType.FABRIC);
+    mNativeProxy.createCommitHook(uiManager);
 
     long jsiRuntime = Objects.requireNonNull(getReactApplicationContext().getJavaScriptContextHolder(), "[react-native-live-markdown] JavaScriptContextHolder is null").get();
     injectJSIBindings(jsiRuntime);

package/apple/LiveMarkdownModule.h

@@ -1,16 +1,8 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <RNLiveMarkdownSpec/RNLiveMarkdownSpec.h>
-#else
-#import <React/RCTBridgeModule.h>
-#endif // RCT_NEW_ARCH_ENABLED
 
 #import <React/RCTEventEmitter.h>
 
 // Without inheriting after RCTEventEmitter we don't get access to bridge
-@interface LiveMarkdownModule : RCTEventEmitter
-#ifdef RCT_NEW_ARCH_ENABLED
-                                <NativeLiveMarkdownModuleSpec>
-#else
-                                <RCTBridgeModule>
-#endif // RCT_NEW_ARCH_ENABLED
+@interface LiveMarkdownModule : RCTEventEmitter <NativeLiveMarkdownModuleSpec>
+
 @end

package/apple/LiveMarkdownModule.mm

@@ -1,17 +1,11 @@
 #import "LiveMarkdownModule.h"
 
 #import <RNLiveMarkdown/RuntimeDecorator.h>
-
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <RNLiveMarkdown/MarkdownCommitHook.h>
-#endif // RCT_NEW_ARCH_ENABLED
 
 #import <React/RCTBridge+Private.h>
-
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTScheduler.h>
 #import <React/RCTSurfacePresenter.h>
-#endif // RCT_NEW_ARCH_ENABLED
 
 #import <jsi/jsi.h>
 
@@ -23,10 +17,8 @@ using namespace expensify::livemarkdown;
 // actually register the hook
 
 @implementation LiveMarkdownModule {
-#ifdef RCT_NEW_ARCH_ENABLED
   std::shared_ptr<MarkdownCommitHook> commitHook_;
   __weak RCTSurfacePresenter *surfacePresenter_;
-#endif // RCT_NEW_ARCH_ENABLED
 }
 
 RCT_EXPORT_MODULE()
@@ -37,16 +29,12 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install)
   jsi::Runtime &rt = *(jsi::Runtime *)cxxBridge.runtime;
   expensify::livemarkdown::injectJSIBindings(rt);
 
-#ifdef RCT_NEW_ARCH_ENABLED
   RCTScheduler *scheduler = [surfacePresenter_ scheduler];
   commitHook_ = std::make_shared<MarkdownCommitHook>(scheduler.uiManager);
-#endif // RCT_NEW_ARCH_ENABLED
 
   return @(1);
 }
 
-#ifdef RCT_NEW_ARCH_ENABLED
-
 - (void)handleJavaScriptDidLoadNotification:(NSNotification *)notification
 {
   surfacePresenter_ = self.bridge.surfacePresenter;
@@ -89,6 +77,4 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install)
   [super invalidate];
 }
 
-#endif // RCT_NEW_ARCH_ENABLED
-
 @end

package/apple/MarkdownCommitHook.h

@@ -1,5 +1,4 @@
 #pragma once
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #include <react/renderer/components/iostextinput/TextInputShadowNode.h>
 #include <react/renderer/uimanager/UIManager.h>
@@ -45,5 +44,3 @@ private:
 
 } // namespace livemarkdown
 } // namespace expensify
-
-#endif // RCT_NEW_ARCH_ENABLED

package/apple/MarkdownCommitHook.mm

@@ -1,5 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
-
 #include <React/RCTUtils.h>
 #include <react/renderer/core/ComponentDescriptor.h>
 #include <react/renderer/textlayoutmanager/RCTAttributedTextUtils.h>
@@ -303,5 +301,3 @@ RootShadowNode::Unshared MarkdownCommitHook::shadowTreeWillCommit(
 
 } // namespace livemarkdown
 } // namespace expensify
-
-#endif // RCT_NEW_ARCH_ENABLED

package/apple/MarkdownTextInputDecoratorComponentView.h

@@ -1,5 +1,3 @@
-// This guard prevent this file to be compiled in the old architecture.
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTViewComponentView.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -8,5 +6,3 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif /* RCT_NEW_ARCH_ENABLED */

package/apple/MarkdownTextInputDecoratorComponentView.mm

@@ -1,19 +1,29 @@
-// This guard prevent this file to be compiled in the old architecture.
-#ifdef RCT_NEW_ARCH_ENABLED
+#import <react/debug/react_native_assert.h>
 #import <react/renderer/components/RNLiveMarkdownSpec/Props.h>
+#import <React/RCTFabricComponentsPlugins.h>
+#import <React/RCTUITextField.h>
 
+#import <RNLiveMarkdown/MarkdownLayoutManager.h>
+#import <RNLiveMarkdown/MarkdownShadowFamilyRegistry.h>
 #import <RNLiveMarkdown/MarkdownTextInputDecoratorComponentView.h>
-#import <RNLiveMarkdown/MarkdownTextInputDecoratorView.h>
+#import <RNLiveMarkdown/MarkdownTextInputDecoratorViewComponentDescriptor.h>
+#import <RNLiveMarkdown/RCTBackedTextFieldDelegateAdapter+Markdown.h>
 #import <RNLiveMarkdown/RCTMarkdownStyle.h>
+#import <RNLiveMarkdown/RCTTextInputComponentView+Markdown.h>
+#import <RNLiveMarkdown/RCTUITextView+Markdown.h>
 
-#import <RNLiveMarkdown/MarkdownTextInputDecoratorViewComponentDescriptor.h>
-#import "MarkdownShadowFamilyRegistry.h"
-#import "RCTFabricComponentsPlugins.h"
+#import <objc/runtime.h>
 
 using namespace facebook::react;
 
 @implementation MarkdownTextInputDecoratorComponentView {
-  MarkdownTextInputDecoratorView *_view;
+  RCTMarkdownUtils *_markdownUtils;
+  RCTMarkdownStyle *_markdownStyle;
+  NSNumber *_parserId;
+  __weak RCTTextInputComponentView *_textInput;
+  __weak UIView<RCTBackedTextInputViewProtocol> *_backedTextInputView;
+  __weak RCTBackedTextFieldDelegateAdapter *_adapter;
+  __weak RCTUITextView *_textView;
   ShadowNodeFamily::Shared _decoratorFamily;
 }
 
@@ -33,10 +43,6 @@ using namespace facebook::react;
   if (self = [super initWithFrame:frame]) {
     static const auto defaultProps = std::make_shared<const MarkdownTextInputDecoratorViewProps>();
     _props = defaultProps;
-
-    _view = [[MarkdownTextInputDecoratorView alloc] init];
-
-    self.contentView = _view;
   }
 
   return self;
@@ -45,11 +51,11 @@ using namespace facebook::react;
 - (void)updateState:(const facebook::react::State::Shared &)state oldState:(const facebook::react::State::Shared &)oldState
 {
     auto data = std::static_pointer_cast<MarkdownTextInputDecoratorShadowNode::ConcreteState const>(state)->getData();
-    
+
     if (_decoratorFamily != nullptr) {
         MarkdownShadowFamilyRegistry::unregisterFamilyForUpdates(_decoratorFamily);
     }
-    
+
     _decoratorFamily = data.decoratorFamily;
     MarkdownShadowFamilyRegistry::registerFamilyForUpdates(_decoratorFamily);
 }
@@ -59,30 +65,119 @@ using namespace facebook::react;
         MarkdownShadowFamilyRegistry::unregisterFamilyForUpdates(_decoratorFamily);
       _decoratorFamily = nullptr;
     }
-    
+
     [super willMoveToSuperview:newSuperview];
 }
 
+- (void)didMoveToWindow {
+  if (self.superview == nil) {
+    return;
+  }
+
+  NSArray *viewsArray = self.superview.subviews;
+  NSUInteger currentIndex = [viewsArray indexOfObject:self];
+
+  react_native_assert(currentIndex != 0 && currentIndex != NSNotFound && "Error while finding current component.");
+  UIView *view = [viewsArray objectAtIndex:currentIndex - 1];
+
+  react_native_assert([view isKindOfClass:[RCTTextInputComponentView class]] && "Previous sibling component is not an instance of RCTTextInputComponentView.");
+  _textInput = (RCTTextInputComponentView *)view;
+  _backedTextInputView = [_textInput valueForKey:@"_backedTextInputView"];
+
+  _markdownUtils = [[RCTMarkdownUtils alloc] init];
+  react_native_assert(_markdownStyle != nil);
+  [_markdownUtils setMarkdownStyle:_markdownStyle];
+  [_markdownUtils setParserId:_parserId];
+
+  [_textInput setMarkdownUtils:_markdownUtils];
+  if ([_backedTextInputView isKindOfClass:[RCTUITextField class]]) {
+    RCTUITextField *textField = (RCTUITextField *)_backedTextInputView;
+    _adapter = [textField valueForKey:@"textInputDelegateAdapter"];
+    [_adapter setMarkdownUtils:_markdownUtils];
+  } else if ([_backedTextInputView isKindOfClass:[RCTUITextView class]]) {
+    _textView = (RCTUITextView *)_backedTextInputView;
+    [_textView setMarkdownUtils:_markdownUtils];
+    NSLayoutManager *layoutManager = _textView.layoutManager; // switching to TextKit 1 compatibility mode
+
+    // Correct content height in TextKit 1 compatibility mode. (See https://github.com/Expensify/App/issues/41567)
+    // Consider removing this fix if it is no longer needed after migrating to TextKit 2.
+    CGSize contentSize = _textView.contentSize;
+    CGRect textBounds = [layoutManager usedRectForTextContainer:_textView.textContainer];
+    contentSize.height = textBounds.size.height + _textView.textContainerInset.top + _textView.textContainerInset.bottom;
+    [_textView setContentSize:contentSize];
+
+    layoutManager.allowsNonContiguousLayout = NO; // workaround for onScroll issue
+    object_setClass(layoutManager, [MarkdownLayoutManager class]);
+    [layoutManager setValue:_markdownUtils forKey:@"markdownUtils"];
+  } else {
+    react_native_assert(false && "Cannot enable Markdown for this type of TextInput.");
+  }
+}
+
+- (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]]) {
+      [_textView.layoutManager setValue:nil forKey:@"markdownUtils"];
+      object_setClass(_textView.layoutManager, [NSLayoutManager class]);
+    }
+  }
+}
+
 - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
 {
     const auto &oldViewProps = *std::static_pointer_cast<MarkdownTextInputDecoratorViewProps const>(_props);
     const auto &newViewProps = *std::static_pointer_cast<MarkdownTextInputDecoratorViewProps const>(props);
 
     if (oldViewProps.parserId != newViewProps.parserId) {
-      [_view setParserId:@(newViewProps.parserId)];
+      [self setParserId:@(newViewProps.parserId)];
     }
 
     // TODO: if (oldViewProps.markdownStyle != newViewProps.markdownStyle)
     RCTMarkdownStyle *markdownStyle = [[RCTMarkdownStyle alloc] initWithStruct:newViewProps.markdownStyle];
-    [_view setMarkdownStyle:markdownStyle];
+    [self setMarkdownStyle:markdownStyle];
 
     [super updateProps:props oldProps:oldProps];
 }
 
+- (void)setMarkdownStyle:(RCTMarkdownStyle *)markdownStyle
+{
+  // TODO: move to updateProps method
+  _markdownStyle = markdownStyle;
+  [_markdownUtils setMarkdownStyle:markdownStyle];
+  [self applyNewStyles];
+}
+
+- (void)setParserId:(NSNumber *)parserId
+{
+  // TODO: move to updateProps method
+  _parserId = parserId;
+  [_markdownUtils setParserId:parserId];
+  [self applyNewStyles];
+}
+
+- (void)applyNewStyles
+{
+  // TODO: call applyNewStyles only once if both markdownStyle and parserId change
+  if (_textView != nil) {
+    // We want to use `textStorage` for applying markdown when possible. Currently it's only available for UITextView
+    [_textView textDidChange];
+  } else {
+    // apply new styles
+    [_textInput _setAttributedString:_backedTextInputView.attributedText];
+  }
+}
+
 Class<RCTComponentViewProtocol> MarkdownTextInputDecoratorViewCls(void)
 {
   return MarkdownTextInputDecoratorComponentView.class;
 }
 
 @end
-#endif

package/apple/MarkdownTextInputDecoratorViewManager.mm

@@ -1,32 +1,11 @@
 #import <RNLiveMarkdown/MarkdownTextInputDecoratorViewManager.h>
-#import <RNLiveMarkdown/MarkdownTextInputDecoratorView.h>
 
 @implementation MarkdownTextInputDecoratorViewManager
 
 RCT_EXPORT_MODULE(MarkdownTextInputDecoratorView)
 
-- (UIView *)view
-{
-  return [[MarkdownTextInputDecoratorView alloc] init];
-}
+RCT_EXPORT_VIEW_PROPERTY(markdownStyle, NSDictionary)
 
-RCT_CUSTOM_VIEW_PROPERTY(markdownStyle, NSDictionary, MarkdownTextInputDecoratorView)
-{
-#ifdef RCT_NEW_ARCH_ENABLED
-  // implemented in MarkdownTextInputDecoratorView updateProps:
-#else
-  RCTMarkdownStyle *markdownStyle = [[RCTMarkdownStyle alloc] initWithDictionary:json];
-  [view setMarkdownStyle:markdownStyle];
-#endif /* RCT_NEW_ARCH_ENABLED */
-}
-
-RCT_CUSTOM_VIEW_PROPERTY(parserId, NSNumber, MarkdownTextInputDecoratorView)
-{
-#ifdef RCT_NEW_ARCH_ENABLED
-  // implemented in MarkdownTextInputDecoratorView updateProps:
-#else
-  [view setParserId:json];
-#endif /* RCT_NEW_ARCH_ENABLED */
-}
+RCT_EXPORT_VIEW_PROPERTY(parserId, NSNumber)
 
 @end

package/apple/RCTMarkdownStyle.h

@@ -1,8 +1,6 @@
 #import <UIKit/UIKit.h>
 
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <react/renderer/components/RNLiveMarkdownSpec/Props.h>
-#endif /* RCT_NEW_ARCH_ENABLED */
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -31,11 +29,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic) UIColor *mentionReportColor;
 @property (nonatomic) UIColor *mentionReportBackgroundColor;
 
-#ifdef RCT_NEW_ARCH_ENABLED
 - (instancetype)initWithStruct:(const facebook::react::MarkdownTextInputDecoratorViewMarkdownStyleStruct &)style;
-#else
-- (instancetype)initWithDictionary:(NSDictionary *)json;
-#endif /* RCT_NEW_ARCH_ENABLED */
 
 @end
 

package/apple/RCTMarkdownStyle.mm

@@ -1,15 +1,9 @@
 #import <RNLiveMarkdown/RCTMarkdownStyle.h>
 
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTConversions.h>
-#else
-#import <React/RCTConvert.h>
-#endif /* RCT_NEW_ARCH_ENABLED */
 
 @implementation RCTMarkdownStyle
 
-#ifdef RCT_NEW_ARCH_ENABLED
-
 - (instancetype)initWithStruct:(const facebook::react::MarkdownTextInputDecoratorViewMarkdownStyleStruct &)style
 {
   if (self = [super init]) {
@@ -49,47 +43,4 @@
   return self;
 }
 
-#else
-
-- (instancetype)initWithDictionary:(NSDictionary *)json
-{
-  if (self = [super init]) {
-    _syntaxColor = [RCTConvert UIColor:json[@"syntax"][@"color"]];
-
-    _linkColor = [RCTConvert UIColor:json[@"link"][@"color"]];
-
-    _h1FontSize = [RCTConvert CGFloat:json[@"h1"][@"fontSize"]];
-
-    _emojiFontSize = [RCTConvert CGFloat:json[@"emoji"][@"fontSize"]];
-
-    _blockquoteBorderColor = [RCTConvert UIColor:json[@"blockquote"][@"borderColor"]];
-    _blockquoteBorderWidth = [RCTConvert CGFloat:json[@"blockquote"][@"borderWidth"]];
-    _blockquoteMarginLeft = [RCTConvert CGFloat:json[@"blockquote"][@"marginLeft"]];
-    _blockquotePaddingLeft = [RCTConvert CGFloat:json[@"blockquote"][@"paddingLeft"]];
-
-    _codeFontFamily = [RCTConvert NSString:json[@"code"][@"fontFamily"]];
-    _codeFontSize = [RCTConvert CGFloat:json[@"code"][@"fontSize"]];
-    _codeColor = [RCTConvert UIColor:json[@"code"][@"color"]];
-    _codeBackgroundColor = [RCTConvert UIColor:json[@"code"][@"backgroundColor"]];
-
-    _preFontFamily = [RCTConvert NSString:json[@"pre"][@"fontFamily"]];
-    _preFontSize = [RCTConvert CGFloat:json[@"pre"][@"fontSize"]];
-    _preColor = [RCTConvert UIColor:json[@"pre"][@"color"]];
-    _preBackgroundColor = [RCTConvert UIColor:json[@"pre"][@"backgroundColor"]];
-
-    _mentionHereColor = [RCTConvert UIColor:json[@"mentionHere"][@"color"]];
-    _mentionHereBackgroundColor = [RCTConvert UIColor:json[@"mentionHere"][@"backgroundColor"]];
-
-    _mentionUserColor = [RCTConvert UIColor:json[@"mentionUser"][@"color"]];
-    _mentionUserBackgroundColor = [RCTConvert UIColor:json[@"mentionUser"][@"backgroundColor"]];
-      
-    _mentionReportColor = [RCTConvert UIColor:json[@"mentionReport"][@"color"]];
-    _mentionReportBackgroundColor = [RCTConvert UIColor:json[@"mentionReport"][@"backgroundColor"]];
-  }
-
-  return self;
-}
-
-#endif /* RCT_NEW_ARCH_ENABLED */
-
 @end

package/apple/RCTTextInputComponentView+Markdown.h

@@ -1,6 +1,3 @@
-// This guard prevent this file to be compiled in the old architecture.
-#ifdef RCT_NEW_ARCH_ENABLED
-
 #import <React/RCTTextInputComponentView.h>
 #import <RNLiveMarkdown/RCTMarkdownUtils.h>
 
@@ -19,5 +16,3 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif /* RCT_NEW_ARCH_ENABLED */

package/apple/RCTTextInputComponentView+Markdown.mm

@@ -1,6 +1,3 @@
-// This guard prevent this file to be compiled in the old architecture.
-#ifdef RCT_NEW_ARCH_ENABLED
-
 #import <RNLiveMarkdown/RCTTextInputComponentView+Markdown.h>
 #import <RNLiveMarkdown/RCTMarkdownUtils.h>
 #import <React/RCTUITextField.h>
@@ -93,5 +90,3 @@ using namespace expensify::livemarkdown;
 }
 
 @end
-
-#endif /* RCT_NEW_ARCH_ENABLED */

package/lib/commonjs/MarkdownTextInput.js

@@ -62,7 +62,6 @@ function processMarkdownStyle(input) {
   return processColorsInMarkdownStyle((0, _styleUtils.mergeMarkdownStyleWithDefault)(input));
 }
 const MarkdownTextInput = /*#__PURE__*/_react.default.forwardRef((props, ref) => {
-  const IS_FABRIC = 'nativeFabricUIManager' in global;
   const markdownStyle = _react.default.useMemo(() => processMarkdownStyle(props.markdownStyle), [props.markdownStyle]);
   if (props.parser === undefined) {
     throw new Error('[react-native-live-markdown] `parser` is undefined');
@@ -82,15 +81,12 @@ const MarkdownTextInput = /*#__PURE__*/_react.default.forwardRef((props, ref) =>
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactNative.TextInput, _extends({}, props, {
     ref: ref
   })), /*#__PURE__*/_react.default.createElement(_MarkdownTextInputDecoratorViewNativeComponent.default, {
-    style: IS_FABRIC ? styles.farAway : styles.displayNone,
+    style: styles.farAway,
     markdownStyle: markdownStyle,
     parserId: parserId
   }));
 });
 const styles = _reactNative.StyleSheet.create({
-  displayNone: {
-    display: 'none'
-  },
   farAway: {
     position: 'absolute',
     top: 1e8,

package/lib/commonjs/MarkdownTextInput.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_react","_interopRequireDefault","_reactNativeReanimated","_MarkdownTextInputDecoratorViewNativeComponent","_NativeLiveMarkdownModule","_styleUtils","e","__esModule","default","_extends","Object","assign","bind","n","arguments","length","t","r","hasOwnProperty","call","apply","initialized","workletRuntime","getWorkletRuntime","undefined","Error","initializeLiveMarkdownIfNeeded","NativeLiveMarkdownModule","install","global","jsi_setMarkdownRuntime","createWorkletRuntime","registerParser","parser","shareableWorklet","makeShareableCloneRecursive","parserId","jsi_registerMarkdownWorklet","unregisterParser","jsi_unregisterMarkdownWorklet","processColorsInMarkdownStyle","input","output","JSON","parse","stringify","keys","forEach","key","obj","prop","endsWith","processColor","processMarkdownStyle","mergeMarkdownStyleWithDefault","MarkdownTextInput","React","forwardRef","props","ref","IS_FABRIC","markdownStyle","useMemo","workletHash","__workletHash","useEffect","createElement","Fragment","TextInput","style","styles","farAway","displayNone","StyleSheet","create","display","position","top","left","_default","exports"],"sourceRoot":"../../src","sources":["MarkdownTextInput.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","_react","_interopRequireDefault","_reactNativeReanimated","_MarkdownTextInputDecoratorViewNativeComponent","_NativeLiveMarkdownModule","_styleUtils","e","__esModule","default","_extends","Object","assign","bind","n","arguments","length","t","r","hasOwnProperty","call","apply","initialized","workletRuntime","getWorkletRuntime","undefined","Error","initializeLiveMarkdownIfNeeded","NativeLiveMarkdownModule","install","global","jsi_setMarkdownRuntime","createWorkletRuntime","registerParser","parser","shareableWorklet","makeShareableCloneRecursive","parserId","jsi_registerMarkdownWorklet","unregisterParser","jsi_unregisterMarkdownWorklet","processColorsInMarkdownStyle","input","output","JSON","parse","stringify","keys","forEach","key","obj","prop","endsWith","processColor","processMarkdownStyle","mergeMarkdownStyleWithDefault","MarkdownTextInput","React","forwardRef","props","ref","markdownStyle","useMemo","workletHash","__workletHash","useEffect","createElement","Fragment","TextInput","style","styles","farAway","StyleSheet","create","position","top","left","_default","exports"],"sourceRoot":"../../src","sources":["MarkdownTextInput.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/MarkdownTextInput.js

@@ -54,7 +54,6 @@ function processMarkdownStyle(input) {
   return processColorsInMarkdownStyle(mergeMarkdownStyleWithDefault(input));
 }
 const MarkdownTextInput = /*#__PURE__*/React.forwardRef((props, ref) => {
-  const IS_FABRIC = 'nativeFabricUIManager' in global;
   const markdownStyle = React.useMemo(() => processMarkdownStyle(props.markdownStyle), [props.markdownStyle]);
   if (props.parser === undefined) {
     throw new Error('[react-native-live-markdown] `parser` is undefined');
@@ -74,15 +73,12 @@ const MarkdownTextInput = /*#__PURE__*/React.forwardRef((props, ref) => {
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TextInput, _extends({}, props, {
     ref: ref
   })), /*#__PURE__*/React.createElement(MarkdownTextInputDecoratorViewNativeComponent, {
-    style: IS_FABRIC ? styles.farAway : styles.displayNone,
+    style: styles.farAway,
     markdownStyle: markdownStyle,
     parserId: parserId
   }));
 });
 const styles = StyleSheet.create({
-  displayNone: {
-    display: 'none'
-  },
   farAway: {
     position: 'absolute',
     top: 1e8,

package/lib/module/MarkdownTextInput.js.map

@@ -1 +1 @@
-{"version":3,"names":["StyleSheet","TextInput","processColor","React","createWorkletRuntime","makeShareableCloneRecursive","MarkdownTextInputDecoratorViewNativeComponent","NativeLiveMarkdownModule","mergeMarkdownStyleWithDefault","initialized","workletRuntime","getWorkletRuntime","undefined","Error","initializeLiveMarkdownIfNeeded","install","global","jsi_setMarkdownRuntime","registerParser","parser","shareableWorklet","parserId","jsi_registerMarkdownWorklet","unregisterParser","jsi_unregisterMarkdownWorklet","processColorsInMarkdownStyle","input","output","JSON","parse","stringify","Object","keys","forEach","key","obj","prop","endsWith","processMarkdownStyle","MarkdownTextInput","forwardRef","props","ref","IS_FABRIC","markdownStyle","useMemo","workletHash","__workletHash","useEffect","createElement","Fragment","_extends","style","styles","farAway","displayNone","create","display","position","top","left"],"sourceRoot":"../../src","sources":["MarkdownTextInput.tsx"],"mappings":";AAAA,SAAQA,UAAU,EAAEC,SAAS,EAAEC,YAAY,QAAO,cAAc;AAChE,OAAOC,KAAK,MAAM,OAAO;AAEzB,SAAQC,oBAAoB,EAAEC,2BAA2B,QAAO,yBAAyB;AAIzF,OAAOC,6CAA6C,MAAM,iDAAiD;AAE3G,OAAOC,wBAAwB,MAAM,4BAA4B;AACjE,SAAQC,6BAA6B,QAAO,cAAc;AAa1D,IAAIC,WAAW,GAAG,KAAK;AACvB,IAAIC,cAA0C;AAE9C,SAASC,iBAAiBA,CAAA,EAAmB;EAC3C,IAAID,cAAc,KAAKE,SAAS,EAAE;IAChC,MAAM,IAAIC,KAAK,CACb,qNACF,CAAC;EACH;EACA,OAAOH,cAAc;AACvB;AAEA,SAASI,8BAA8BA,CAAA,EAAG;EACxC,IAAIL,WAAW,EAAE;IACf;EACF;EACA,IAAIF,wBAAwB,EAAE;IAC5BA,wBAAwB,CAACQ,OAAO,CAAC,CAAC;EACpC;EACA,IAAI,CAACC,MAAM,CAACC,sBAAsB,EAAE;IAClC,MAAM,IAAIJ,KAAK,CAAC,6EAA6E,CAAC;EAChG;EACAH,cAAc,GAAGN,oBAAoB,CAAC,qBAAqB,CAAC;EAC5DY,MAAM,CAACC,sBAAsB,CAACP,cAAc,CAAC;EAC7CD,WAAW,GAAG,IAAI;AACpB;AAEA,SAASS,cAAcA,CAACC,MAA0C,EAAU;EAC1EL,8BAA8B,CAAC,CAAC;EAChC,MAAMM,gBAAgB,GAAGf,2BAA2B,CAACc,MAAM,CAA6D;EACxH,MAAME,QAAQ,GAAGL,MAAM,CAACM,2BAA2B,CAACF,gBAAgB,CAAC;EACrE,OAAOC,QAAQ;AACjB;AAEA,SAASE,gBAAgBA,CAACF,QAAgB,EAAE;EAC1CL,MAAM,CAACQ,6BAA6B,CAACH,QAAQ,CAAC;AAChD;AAeA,SAASI,4BAA4BA,CAACC,KAAoB,EAAiB;EACzE,MAAMC,MAAM,GAAGC,IAAI,CAACC,KAAK,CAACD,IAAI,CAACE,SAAS,CAACJ,KAAK,CAAC,CAAC;EAEhDK,MAAM,CAACC,IAAI,CAACL,MAAM,CAAC,CAACM,OAAO,CAAEC,GAAG,IAAK;IACnC,MAAMC,GAAG,GAAGR,MAAM,CAACO,GAAG,CAAC;IACvBH,MAAM,CAACC,IAAI,CAACG,GAAG,CAAC,CAACF,OAAO,CAAEG,IAAI,IAAK;MACjC;MACA,IAAI,EAAEA,IAAI,KAAK,OAAO,IAAIA,IAAI,CAACC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE;QACjD;MACF;MACAF,GAAG,CAACC,IAAI,CAAC,GAAGlC,YAAY,CAACiC,GAAG,CAACC,IAAI,CAAC,CAAC;IACrC,CAAC,CAAC;EACJ,CAAC,CAAC;EAEF,OAAOT,MAAM;AACf;AAEA,SAASW,oBAAoBA,CAACZ,KAAuC,EAAiB;EACpF,OAAOD,4BAA4B,CAACjB,6BAA6B,CAACkB,KAAK,CAAC,CAAC;AAC3E;AAEA,MAAMa,iBAAiB,gBAAGpC,KAAK,CAACqC,UAAU,CAA4C,CAACC,KAAK,EAAEC,GAAG,KAAK;EACpG,MAAMC,SAAS,GAAG,uBAAuB,IAAI3B,MAAM;EAEnD,MAAM4B,aAAa,GAAGzC,KAAK,CAAC0C,OAAO,CAAC,MAAMP,oBAAoB,CAACG,KAAK,CAACG,aAAa,CAAC,EAAE,CAACH,KAAK,CAACG,aAAa,CAAC,CAAC;EAE3G,IAAIH,KAAK,CAACtB,MAAM,KAAKP,SAAS,EAAE;IAC9B,MAAM,IAAIC,KAAK,CAAC,oDAAoD,CAAC;EACvE;;EAEA;EACA,MAAMiC,WAAW,GAAIL,KAAK,CAACtB,MAAM,CAA8B4B,aAAa;EAC5E,IAAID,WAAW,KAAKlC,SAAS,EAAE;IAC7B,MAAM,IAAIC,KAAK,CAAC,wDAAwD,CAAC;EAC3E;EAEA,MAAMQ,QAAQ,GAAGlB,KAAK,CAAC0C,OAAO,CAAC,MAAM;IACnC,OAAO3B,cAAc,CAACuB,KAAK,CAACtB,MAAM,CAAC;EACrC,CAAC,EAAE,CAACsB,KAAK,CAACtB,MAAM,CAAC,CAAC;EAElBhB,KAAK,CAAC6C,SAAS,CAAC,MAAM;IACpB,OAAO,MAAMzB,gBAAgB,CAACF,QAAQ,CAAC;EACzC,CAAC,EAAE,CAACA,QAAQ,CAAC,CAAC;EAEd,oBACElB,KAAA,CAAA8C,aAAA,CAAA9C,KAAA,CAAA+C,QAAA,qBACE/C,KAAA,CAAA8C,aAAA,CAAChD,SAAS,EAAAkD,QAAA,KACJV,KAAK;IACTC,GAAG,EAAEA;EAAI,EACV,CAAC,eACFvC,KAAA,CAAA8C,aAAA,CAAC3C,6CAA6C;IAC5C8C,KAAK,EAAET,SAAS,GAAGU,MAAM,CAACC,OAAO,GAAGD,MAAM,CAACE,WAAY;IACvDX,aAAa,EAAEA,aAAc;IAC7BvB,QAAQ,EAAEA;EAAS,CACpB,CACD,CAAC;AAEP,CAAC,CAAC;AAEF,MAAMgC,MAAM,GAAGrD,UAAU,CAACwD,MAAM,CAAC;EAC/BD,WAAW,EAAE;IACXE,OAAO,EAAE;EACX,CAAC;EACDH,OAAO,EAAE;IACPI,QAAQ,EAAE,UAAU;IACpBC,GAAG,EAAE,GAAG;IACRC,IAAI,EAAE;EACR;AACF,CAAC,CAAC;AAIF,eAAerB,iBAAiB;AAEhC,SAAQ5B,iBAAiB","ignoreList":[]}
+{"version":3,"names":["StyleSheet","TextInput","processColor","React","createWorkletRuntime","makeShareableCloneRecursive","MarkdownTextInputDecoratorViewNativeComponent","NativeLiveMarkdownModule","mergeMarkdownStyleWithDefault","initialized","workletRuntime","getWorkletRuntime","undefined","Error","initializeLiveMarkdownIfNeeded","install","global","jsi_setMarkdownRuntime","registerParser","parser","shareableWorklet","parserId","jsi_registerMarkdownWorklet","unregisterParser","jsi_unregisterMarkdownWorklet","processColorsInMarkdownStyle","input","output","JSON","parse","stringify","Object","keys","forEach","key","obj","prop","endsWith","processMarkdownStyle","MarkdownTextInput","forwardRef","props","ref","markdownStyle","useMemo","workletHash","__workletHash","useEffect","createElement","Fragment","_extends","style","styles","farAway","create","position","top","left"],"sourceRoot":"../../src","sources":["MarkdownTextInput.tsx"],"mappings":";AAAA,SAAQA,UAAU,EAAEC,SAAS,EAAEC,YAAY,QAAO,cAAc;AAChE,OAAOC,KAAK,MAAM,OAAO;AAEzB,SAAQC,oBAAoB,EAAEC,2BAA2B,QAAO,yBAAyB;AAIzF,OAAOC,6CAA6C,MAAM,iDAAiD;AAE3G,OAAOC,wBAAwB,MAAM,4BAA4B;AACjE,SAAQC,6BAA6B,QAAO,cAAc;AAa1D,IAAIC,WAAW,GAAG,KAAK;AACvB,IAAIC,cAA0C;AAE9C,SAASC,iBAAiBA,CAAA,EAAmB;EAC3C,IAAID,cAAc,KAAKE,SAAS,EAAE;IAChC,MAAM,IAAIC,KAAK,CACb,qNACF,CAAC;EACH;EACA,OAAOH,cAAc;AACvB;AAEA,SAASI,8BAA8BA,CAAA,EAAG;EACxC,IAAIL,WAAW,EAAE;IACf;EACF;EACA,IAAIF,wBAAwB,EAAE;IAC5BA,wBAAwB,CAACQ,OAAO,CAAC,CAAC;EACpC;EACA,IAAI,CAACC,MAAM,CAACC,sBAAsB,EAAE;IAClC,MAAM,IAAIJ,KAAK,CAAC,6EAA6E,CAAC;EAChG;EACAH,cAAc,GAAGN,oBAAoB,CAAC,qBAAqB,CAAC;EAC5DY,MAAM,CAACC,sBAAsB,CAACP,cAAc,CAAC;EAC7CD,WAAW,GAAG,IAAI;AACpB;AAEA,SAASS,cAAcA,CAACC,MAA0C,EAAU;EAC1EL,8BAA8B,CAAC,CAAC;EAChC,MAAMM,gBAAgB,GAAGf,2BAA2B,CAACc,MAAM,CAA6D;EACxH,MAAME,QAAQ,GAAGL,MAAM,CAACM,2BAA2B,CAACF,gBAAgB,CAAC;EACrE,OAAOC,QAAQ;AACjB;AAEA,SAASE,gBAAgBA,CAACF,QAAgB,EAAE;EAC1CL,MAAM,CAACQ,6BAA6B,CAACH,QAAQ,CAAC;AAChD;AAeA,SAASI,4BAA4BA,CAACC,KAAoB,EAAiB;EACzE,MAAMC,MAAM,GAAGC,IAAI,CAACC,KAAK,CAACD,IAAI,CAACE,SAAS,CAACJ,KAAK,CAAC,CAAC;EAEhDK,MAAM,CAACC,IAAI,CAACL,MAAM,CAAC,CAACM,OAAO,CAAEC,GAAG,IAAK;IACnC,MAAMC,GAAG,GAAGR,MAAM,CAACO,GAAG,CAAC;IACvBH,MAAM,CAACC,IAAI,CAACG,GAAG,CAAC,CAACF,OAAO,CAAEG,IAAI,IAAK;MACjC;MACA,IAAI,EAAEA,IAAI,KAAK,OAAO,IAAIA,IAAI,CAACC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE;QACjD;MACF;MACAF,GAAG,CAACC,IAAI,CAAC,GAAGlC,YAAY,CAACiC,GAAG,CAACC,IAAI,CAAC,CAAC;IACrC,CAAC,CAAC;EACJ,CAAC,CAAC;EAEF,OAAOT,MAAM;AACf;AAEA,SAASW,oBAAoBA,CAACZ,KAAuC,EAAiB;EACpF,OAAOD,4BAA4B,CAACjB,6BAA6B,CAACkB,KAAK,CAAC,CAAC;AAC3E;AAEA,MAAMa,iBAAiB,gBAAGpC,KAAK,CAACqC,UAAU,CAA4C,CAACC,KAAK,EAAEC,GAAG,KAAK;EACpG,MAAMC,aAAa,GAAGxC,KAAK,CAACyC,OAAO,CAAC,MAAMN,oBAAoB,CAACG,KAAK,CAACE,aAAa,CAAC,EAAE,CAACF,KAAK,CAACE,aAAa,CAAC,CAAC;EAE3G,IAAIF,KAAK,CAACtB,MAAM,KAAKP,SAAS,EAAE;IAC9B,MAAM,IAAIC,KAAK,CAAC,oDAAoD,CAAC;EACvE;;EAEA;EACA,MAAMgC,WAAW,GAAIJ,KAAK,CAACtB,MAAM,CAA8B2B,aAAa;EAC5E,IAAID,WAAW,KAAKjC,SAAS,EAAE;IAC7B,MAAM,IAAIC,KAAK,CAAC,wDAAwD,CAAC;EAC3E;EAEA,MAAMQ,QAAQ,GAAGlB,KAAK,CAACyC,OAAO,CAAC,MAAM;IACnC,OAAO1B,cAAc,CAACuB,KAAK,CAACtB,MAAM,CAAC;EACrC,CAAC,EAAE,CAACsB,KAAK,CAACtB,MAAM,CAAC,CAAC;EAElBhB,KAAK,CAAC4C,SAAS,CAAC,MAAM;IACpB,OAAO,MAAMxB,gBAAgB,CAACF,QAAQ,CAAC;EACzC,CAAC,EAAE,CAACA,QAAQ,CAAC,CAAC;EAEd,oBACElB,KAAA,CAAA6C,aAAA,CAAA7C,KAAA,CAAA8C,QAAA,qBACE9C,KAAA,CAAA6C,aAAA,CAAC/C,SAAS,EAAAiD,QAAA,KACJT,KAAK;IACTC,GAAG,EAAEA;EAAI,EACV,CAAC,eACFvC,KAAA,CAAA6C,aAAA,CAAC1C,6CAA6C;IAC5C6C,KAAK,EAAEC,MAAM,CAACC,OAAQ;IACtBV,aAAa,EAAEA,aAAc;IAC7BtB,QAAQ,EAAEA;EAAS,CACpB,CACD,CAAC;AAEP,CAAC,CAAC;AAEF,MAAM+B,MAAM,GAAGpD,UAAU,CAACsD,MAAM,CAAC;EAC/BD,OAAO,EAAE;IACPE,QAAQ,EAAE,UAAU;IACpBC,GAAG,EAAE,GAAG;IACRC,IAAI,EAAE;EACR;AACF,CAAC,CAAC;AAIF,eAAelB,iBAAiB;AAEhC,SAAQ5B,iBAAiB","ignoreList":[]}

package/lib/typescript/src/MarkdownTextInput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MarkdownTextInput.d.ts","sourceRoot":"","sources":["../../../src/MarkdownTextInput.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAa,SAAS,EAAe,MAAM,cAAc,CAAC;AACjE,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;AAEjD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAC,YAAY,EAAE,eAAe,EAAC,MAAM,oDAAoD,CAAC;AAMtG,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,cAAc,CAAC;AACvD,OAAO,KAAK,EAAC,sBAAsB,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;AAEzE,OAAO,CAAC,MAAM,CAAC;IAEb,IAAI,sBAAsB,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAC;IAE9D,IAAI,2BAA2B,EAAE,CAAC,gBAAgB,EAAE,YAAY,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC;IAExH,IAAI,6BAA6B,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;CAC/D;AAKD,iBAAS,iBAAiB,IAAI,cAAc,CAO3C;AA4BD,UAAU,sBAAuB,SAAQ,cAAc,EAAE,sBAAsB;IAC7E,aAAa,CAAC,EAAE,oBAAoB,CAAC;IACrC,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,KAAK,qBAAqB,CAAC;IAC/H,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,aAAa,EAAE,CAAC;CAC5C;AAED,KAAK,qBAAqB,GAAG;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,KAAK,iBAAiB,GAAG,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;AAuB7E,QAAA,MAAM,iBAAiB,kGAoCrB,CAAC;AAaH,YAAY,EAAC,oBAAoB,IAAI,aAAa,EAAE,sBAAsB,EAAC,CAAC;AAE5E,eAAe,iBAAiB,CAAC;AAEjC,OAAO,EAAC,iBAAiB,EAAC,CAAC"}
+{"version":3,"file":"MarkdownTextInput.d.ts","sourceRoot":"","sources":["../../../src/MarkdownTextInput.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAa,SAAS,EAAe,MAAM,cAAc,CAAC;AACjE,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;AAEjD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAC,YAAY,EAAE,eAAe,EAAC,MAAM,oDAAoD,CAAC;AAMtG,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,cAAc,CAAC;AACvD,OAAO,KAAK,EAAC,sBAAsB,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;AAEzE,OAAO,CAAC,MAAM,CAAC;IAEb,IAAI,sBAAsB,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAC;IAE9D,IAAI,2BAA2B,EAAE,CAAC,gBAAgB,EAAE,YAAY,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC;IAExH,IAAI,6BAA6B,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;CAC/D;AAKD,iBAAS,iBAAiB,IAAI,cAAc,CAO3C;AA4BD,UAAU,sBAAuB,SAAQ,cAAc,EAAE,sBAAsB;IAC7E,aAAa,CAAC,EAAE,oBAAoB,CAAC;IACrC,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,KAAK,qBAAqB,CAAC;IAC/H,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,aAAa,EAAE,CAAC;CAC5C;AAED,KAAK,qBAAqB,GAAG;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,KAAK,iBAAiB,GAAG,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;AAuB7E,QAAA,MAAM,iBAAiB,kGAkCrB,CAAC;AAUH,YAAY,EAAC,oBAAoB,IAAI,aAAa,EAAE,sBAAsB,EAAC,CAAC;AAE5E,eAAe,iBAAiB,CAAC;AAEjC,OAAO,EAAC,iBAAiB,EAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expensify/react-native-live-markdown",
-  "version": "0.1.244",
+  "version": "0.1.246",
   "description": "Drop-in replacement for React Native's TextInput component with Markdown formatting.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -165,6 +165,9 @@
   "codegenConfig": {
     "name": "RNLiveMarkdownSpec",
     "type": "all",
-    "jsSrcsDir": "src"
+    "jsSrcsDir": "src",
+    "android": {
+      "javaPackageName": "com.expensify.livemarkdown"
+    }
   }
 }

package/src/MarkdownTextInput.tsx

@@ -94,8 +94,6 @@ function processMarkdownStyle(input: PartialMarkdownStyle | undefined): Markdown
 }
 
 const MarkdownTextInput = React.forwardRef<MarkdownTextInput, MarkdownTextInputProps>((props, ref) => {
-  const IS_FABRIC = 'nativeFabricUIManager' in global;
-
   const markdownStyle = React.useMemo(() => processMarkdownStyle(props.markdownStyle), [props.markdownStyle]);
 
   if (props.parser === undefined) {
@@ -123,7 +121,7 @@ const MarkdownTextInput = React.forwardRef<MarkdownTextInput, MarkdownTextInputP
         ref={ref}
       />
       <MarkdownTextInputDecoratorViewNativeComponent
-        style={IS_FABRIC ? styles.farAway : styles.displayNone}
+        style={styles.farAway}
         markdownStyle={markdownStyle}
         parserId={parserId}
       />
@@ -132,9 +130,6 @@ const MarkdownTextInput = React.forwardRef<MarkdownTextInput, MarkdownTextInputP
 });
 
 const styles = StyleSheet.create({
-  displayNone: {
-    display: 'none',
-  },
   farAway: {
     position: 'absolute',
     top: 1e8,

package/android/src/oldarch/LiveMarkdownModuleSpec.java

@@ -1,12 +0,0 @@
-package com.expensify.livemarkdown;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-
-abstract class LiveMarkdownModuleSpec extends ReactContextBaseJavaModule {
-  LiveMarkdownModuleSpec(ReactApplicationContext context) {
-    super(context);
-  }
-
-  public abstract boolean install();
-}

package/android/src/oldarch/MarkdownTextInputDecoratorViewManagerSpec.java

@@ -1,11 +0,0 @@
-package com.expensify.livemarkdown;
-
-import android.view.View;
-
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.uimanager.SimpleViewManager;
-
-public abstract class MarkdownTextInputDecoratorViewManagerSpec<T extends View> extends SimpleViewManager<T> {
-  public abstract void setMarkdownStyle(T view, ReadableMap value);
-  public abstract void setParserId(T view, int value);
-}

package/android/src/oldarch/NativeLiveMarkdownModuleSpec.java

@@ -1,37 +0,0 @@
-
-/**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
- *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
- *
- * @generated by codegen project: GenerateModuleJavaSpec.js
- *
- * @nolint
- */
-
-package com.expensify.livemarkdown;
-
-import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.turbomodule.core.interfaces.TurboModule;
-import javax.annotation.Nonnull;
-
-public abstract class NativeLiveMarkdownModuleSpec extends ReactContextBaseJavaModule implements TurboModule {
-  public static final String NAME = "LiveMarkdownModule";
-
-  public NativeLiveMarkdownModuleSpec(ReactApplicationContext reactContext) {
-    super(reactContext);
-  }
-
-  @Override
-  public @Nonnull String getName() {
-    return NAME;
-  }
-
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  @DoNotStrip
-  public abstract boolean install();
-}

package/android/src/oldarch/NativeProxy.java

@@ -1,9 +0,0 @@
-package com.expensify.livemarkdown;
-
-import com.facebook.react.bridge.UIManager;
-
-public class NativeProxy {
-  public void createCommitHook(UIManager uiManager) {
-    // no-op on the old arch
-  }
-}

package/apple/MarkdownTextInputDecoratorView.h

@@ -1,14 +0,0 @@
-#import <UIKit/UIKit.h>
-#import <RNLiveMarkdown/RCTMarkdownStyle.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface MarkdownTextInputDecoratorView : UIView
-
-- (void)setMarkdownStyle:(RCTMarkdownStyle *)markdownStyle;
-
-- (void)setParserId:(NSNumber *)parserId;
-
-@end
-
-NS_ASSUME_NONNULL_END

package/apple/MarkdownTextInputDecoratorView.mm

@@ -1,139 +0,0 @@
-#import <React/RCTUITextField.h>
-#import "react_native_assert.h"
-
-#import <RNLiveMarkdown/MarkdownLayoutManager.h>
-#import <RNLiveMarkdown/MarkdownTextInputDecoratorView.h>
-#import <RNLiveMarkdown/RCTBackedTextFieldDelegateAdapter+Markdown.h>
-#import <RNLiveMarkdown/RCTUITextView+Markdown.h>
-
-#ifdef RCT_NEW_ARCH_ENABLED
-#import <RNLiveMarkdown/RCTTextInputComponentView+Markdown.h>
-#else
-#import <RNLiveMarkdown/RCTBaseTextInputView+Markdown.h>
-#endif /* RCT_NEW_ARCH_ENABLED */
-
-#import <objc/runtime.h>
-
-@implementation MarkdownTextInputDecoratorView {
-  RCTMarkdownUtils *_markdownUtils;
-  RCTMarkdownStyle *_markdownStyle;
-  NSNumber *_parserId;
-#ifdef RCT_NEW_ARCH_ENABLED
-  __weak RCTTextInputComponentView *_textInput;
-#else
-  __weak RCTBaseTextInputView *_textInput;
-#endif /* RCT_NEW_ARCH_ENABLED */
-  __weak UIView<RCTBackedTextInputViewProtocol> *_backedTextInputView;
-  __weak RCTBackedTextFieldDelegateAdapter *_adapter;
-  __weak RCTUITextView *_textView;
-}
-
-- (void)didMoveToWindow {
-#ifdef RCT_NEW_ARCH_ENABLED
-  if (self.superview.superview == nil) {
-    return;
-  }
-#else
-  if (self.superview == nil) {
-    return;
-  }
-#endif /* RCT_NEW_ARCH_ENABLED */
-
-#ifdef RCT_NEW_ARCH_ENABLED
-  NSArray *viewsArray = self.superview.superview.subviews;
-  NSUInteger currentIndex = [viewsArray indexOfObject:self.superview];
-#else
-  NSArray *viewsArray = self.superview.subviews;
-  NSUInteger currentIndex = [viewsArray indexOfObject:self];
-#endif /* RCT_NEW_ARCH_ENABLED */
-
-  react_native_assert(currentIndex != 0 && currentIndex != NSNotFound && "Error while finding current component.");
-  UIView *view = [viewsArray objectAtIndex:currentIndex - 1];
-
-#ifdef RCT_NEW_ARCH_ENABLED
-  react_native_assert([view isKindOfClass:[RCTTextInputComponentView class]] && "Previous sibling component is not an instance of RCTTextInputComponentView.");
-  _textInput = (RCTTextInputComponentView *)view;
-  _backedTextInputView = [_textInput valueForKey:@"_backedTextInputView"];
-#else
-  react_native_assert([view isKindOfClass:[RCTBaseTextInputView class]] && "Previous sibling component is not an instance of RCTBaseTextInputView.");
-  _textInput = (RCTBaseTextInputView *)view;
-  _backedTextInputView = _textInput.backedTextInputView;
-#endif /* RCT_NEW_ARCH_ENABLED */
-
-  _markdownUtils = [[RCTMarkdownUtils alloc] init];
-  react_native_assert(_markdownStyle != nil);
-  [_markdownUtils setMarkdownStyle:_markdownStyle];
-  [_markdownUtils setParserId:_parserId];
-
-  [_textInput setMarkdownUtils:_markdownUtils];
-  if ([_backedTextInputView isKindOfClass:[RCTUITextField class]]) {
-    RCTUITextField *textField = (RCTUITextField *)_backedTextInputView;
-    _adapter = [textField valueForKey:@"textInputDelegateAdapter"];
-    [_adapter setMarkdownUtils:_markdownUtils];
-  } else if ([_backedTextInputView isKindOfClass:[RCTUITextView class]]) {
-    _textView = (RCTUITextView *)_backedTextInputView;
-    [_textView setMarkdownUtils:_markdownUtils];
-    NSLayoutManager *layoutManager = _textView.layoutManager; // switching to TextKit 1 compatibility mode
-
-    // Correct content height in TextKit 1 compatibility mode. (See https://github.com/Expensify/App/issues/41567)
-    // Consider removing this fix if it is no longer needed after migrating to TextKit 2.
-    CGSize contentSize = _textView.contentSize;
-    CGRect textBounds = [layoutManager usedRectForTextContainer:_textView.textContainer];
-    contentSize.height = textBounds.size.height + _textView.textContainerInset.top + _textView.textContainerInset.bottom;
-    [_textView setContentSize:contentSize];
-
-    layoutManager.allowsNonContiguousLayout = NO; // workaround for onScroll issue
-    object_setClass(layoutManager, [MarkdownLayoutManager class]);
-    [layoutManager setValue:_markdownUtils forKey:@"markdownUtils"];
-  } else {
-    react_native_assert(false && "Cannot enable Markdown for this type of TextInput.");
-  }
-}
-
-- (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]]) {
-      [_textView.layoutManager setValue:nil forKey:@"markdownUtils"];
-      object_setClass(_textView.layoutManager, [NSLayoutManager class]);
-    }
-  }
-}
-
-- (void)setMarkdownStyle:(RCTMarkdownStyle *)markdownStyle
-{
-  _markdownStyle = markdownStyle;
-  [_markdownUtils setMarkdownStyle:markdownStyle];
-  [self applyNewStyles];
-}
-
-- (void)setParserId:(NSNumber *)parserId
-{
-  _parserId = parserId;
-  [_markdownUtils setParserId:parserId];
-  [self applyNewStyles];
-}
-
-- (void)applyNewStyles
-{
-  if (_textView != nil) {
-    // We want to use `textStorage` for applying markdown when possible. Currently it's only available for UITextView
-    [_textView textDidChange];
-  } else {
-    // apply new styles
-#ifdef RCT_NEW_ARCH_ENABLED
-    [_textInput _setAttributedString:_backedTextInputView.attributedText];
-#else
-    [_textInput setAttributedText:_textInput.attributedText];
-#endif /* RCT_NEW_ARCH_ENABLED */
-  }
-}
-
-@end

package/apple/RCTBaseTextInputView+Markdown.h

@@ -1,18 +0,0 @@
-#import <React/RCTBaseTextInputView.h>
-#import <RNLiveMarkdown/RCTMarkdownUtils.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface RCTBaseTextInputView (Markdown)
-
-@property(nonatomic, nullable, getter=getMarkdownUtils) RCTMarkdownUtils *markdownUtils;
-
-- (void)markdown_setAttributedText:(NSAttributedString *)attributedText;
-
-- (BOOL)markdown_textOf:(NSAttributedString *)newText equals:(NSAttributedString *)oldText;
-
-- (void)markdown_updateLocalData;
-
-@end
-
-NS_ASSUME_NONNULL_END

package/apple/RCTBaseTextInputView+Markdown.mm

@@ -1,101 +0,0 @@
-#import <RNLiveMarkdown/RCTBaseTextInputView+Markdown.h>
-#import <RNLiveMarkdown/RCTMarkdownUtils.h>
-#import <objc/message.h>
-
-@implementation RCTBaseTextInputView (Markdown)
-
-- (void)setMarkdownUtils:(RCTMarkdownUtils *)markdownUtils {
-  objc_setAssociatedObject(self, @selector(getMarkdownUtils), markdownUtils, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-- (RCTMarkdownUtils *)getMarkdownUtils {
-  return objc_getAssociatedObject(self, @selector(getMarkdownUtils));
-}
-
-- (void)markdown_setAttributedText:(NSAttributedString *)attributedText
-{
-  RCTMarkdownUtils *markdownUtils = [self getMarkdownUtils];
-  if (markdownUtils != nil) {
-    attributedText = [markdownUtils parseMarkdown:attributedText withDefaultTextAttributes:self.backedTextInputView.defaultTextAttributes];
-  }
-
-  // Call the original method
-  [self markdown_setAttributedText:attributedText];
-}
-
-- (BOOL)markdown_textOf:(NSAttributedString *)newText equals:(NSAttributedString *)oldText
-{
-  RCTMarkdownUtils *markdownUtils = [self getMarkdownUtils];
-  if (markdownUtils != nil) {
-    // Emoji characters are automatically assigned an AppleColorEmoji NSFont and the original font is moved to NSOriginalFont
-    // We need to remove these attributes before comparison
-    NSMutableAttributedString *newTextCopy = [newText mutableCopy];
-    NSMutableAttributedString *oldTextCopy = [oldText mutableCopy];
-    [newTextCopy removeAttribute:@"NSFont" range:NSMakeRange(0, newTextCopy.length)];
-    [oldTextCopy removeAttribute:@"NSFont" range:NSMakeRange(0, oldTextCopy.length)];
-    [oldTextCopy removeAttribute:@"NSOriginalFont" range:NSMakeRange(0, oldTextCopy.length)];
-    return [newTextCopy isEqualToAttributedString:oldTextCopy];
-  }
-
-  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 withDefaultTextAttributes: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;
-  dispatch_once(&onceToken, ^{
-    Class cls = [self class];
-
-    {
-      // swizzle setAttributedText
-      SEL originalSelector = @selector(setAttributedText:);
-      SEL swizzledSelector = @selector(markdown_setAttributedText:);
-      Method originalMethod = class_getInstanceMethod(cls, originalSelector);
-      Method swizzledMethod = class_getInstanceMethod(cls, swizzledSelector);
-      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:);
-      SEL swizzledSelector = @selector(markdown_textOf:equals:);
-      Method originalMethod = class_getInstanceMethod(cls, originalSelector);
-      Method swizzledMethod = class_getInstanceMethod(cls, swizzledSelector);
-      method_exchangeImplementations(originalMethod, swizzledMethod);
-    }
-  });
-}
-
-@end