@expensify/react-native-live-markdown 0.1.187 → 0.1.188

package/apple/{RCTLiveMarkdownModule.mm → LiveMarkdownModule.mm}

@@ -1,40 +1,55 @@
+#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 "MarkdownCommitHook.h"
-#import "MarkdownShadowFamilyRegistry.h"
-#import "RCTLiveMarkdownModule.h"
+#import <jsi/jsi.h>
 
+using namespace facebook;
 using namespace expensify::livemarkdown;
 
 // A turbomodule used to register the commit hook
 // I think this is the easiest way to access the UIManager, which we need to
 // actually register the hook
 
-@implementation RCTLiveMarkdownModule {
-  BOOL installed_;
+@implementation LiveMarkdownModule {
+#ifdef RCT_NEW_ARCH_ENABLED
   std::shared_ptr<MarkdownCommitHook> commitHook_;
   __weak RCTSurfacePresenter *surfacePresenter_;
+#endif // RCT_NEW_ARCH_ENABLED
 }
 
-RCT_EXPORT_MODULE(@"LiveMarkdownModule")
+RCT_EXPORT_MODULE()
 
-- (NSNumber *)install {
-  if (!installed_ && surfacePresenter_ != nil) {
-    RCTScheduler *scheduler = [surfacePresenter_ scheduler];
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install)
+{
+  RCTCxxBridge *cxxBridge = (RCTCxxBridge *)self.bridge;
+  jsi::Runtime &rt = *(jsi::Runtime *)cxxBridge.runtime;
+  expensify::livemarkdown::injectJSIBindings(rt);
 
-    commitHook_ = std::make_shared<MarkdownCommitHook>(scheduler.uiManager);
-    installed_ = YES;
-  }
-  return @1;
+#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;
-  [self install];
 }
 
 - (void)setBridge:(RCTBridge *)bridge
@@ -62,7 +77,6 @@ RCT_EXPORT_MODULE(@"LiveMarkdownModule")
   surfacePresenter_ = surfacePresenter;
 }
 
-
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params {
   return std::make_shared<facebook::react::NativeLiveMarkdownModuleSpecJSI>(
@@ -75,6 +89,6 @@ RCT_EXPORT_MODULE(@"LiveMarkdownModule")
   [super invalidate];
 }
 
-@end
-
 #endif // RCT_NEW_ARCH_ENABLED
+
+@end

package/apple/MarkdownCommitHook.mm

@@ -158,6 +158,7 @@ RootShadowNode::Unshared MarkdownCommitHook::shadowTreeWillCommit(
             usedUtils =
                 MarkdownCommitHook::getOrCreateMarkdownUtils(*nodes.decorator);
             [usedUtils setMarkdownStyle:markdownStyle];
+            [usedUtils setParserId:@(markdownProps.parserId)];
 
             // convert the attibuted string stored in state to
             // NSAttributedString
@@ -236,6 +237,7 @@ RootShadowNode::Unshared MarkdownCommitHook::shadowTreeWillCommit(
             usedUtils =
                 MarkdownCommitHook::getOrCreateMarkdownUtils(*nodes.decorator);
             [usedUtils setMarkdownStyle:markdownStyle];
+            [usedUtils setParserId:@(markdownProps.parserId)];
 
             // convert the attibuted string stored in state to
             // NSAttributedString

package/apple/MarkdownTextInputDecoratorComponentView.mm

@@ -68,6 +68,10 @@ using namespace facebook::react;
     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)];
+    }
+
     // TODO: if (oldViewProps.markdownStyle != newViewProps.markdownStyle)
     RCTMarkdownStyle *markdownStyle = [[RCTMarkdownStyle alloc] initWithStruct:newViewProps.markdownStyle];
     [_view setMarkdownStyle:markdownStyle];

package/apple/MarkdownTextInputDecoratorView.h

@@ -7,6 +7,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)setMarkdownStyle:(RCTMarkdownStyle *)markdownStyle;
 
+- (void)setParserId:(NSNumber *)parserId;
+
 @end
 
 NS_ASSUME_NONNULL_END

package/apple/MarkdownTextInputDecoratorView.mm

@@ -17,6 +17,7 @@
 @implementation MarkdownTextInputDecoratorView {
   RCTMarkdownUtils *_markdownUtils;
   RCTMarkdownStyle *_markdownStyle;
+  NSNumber *_parserId;
 #ifdef RCT_NEW_ARCH_ENABLED
   __weak RCTTextInputComponentView *_textInput;
 #else
@@ -62,6 +63,7 @@
   _markdownUtils = [[RCTMarkdownUtils alloc] init];
   react_native_assert(_markdownStyle != nil);
   [_markdownUtils setMarkdownStyle:_markdownStyle];
+  [_markdownUtils setParserId:_parserId];
 
   [_textInput setMarkdownUtils:_markdownUtils];
   if ([_backedTextInputView isKindOfClass:[RCTUITextField class]]) {
@@ -109,7 +111,18 @@
 {
   _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];

package/apple/MarkdownTextInputDecoratorViewManager.mm

@@ -20,4 +20,13 @@ RCT_CUSTOM_VIEW_PROPERTY(markdownStyle, NSDictionary, MarkdownTextInputDecorator
 #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 */
+}
+
 @end

package/apple/RCTMarkdownUtils.h

@@ -6,6 +6,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface RCTMarkdownUtils : NSObject
 
 @property (nonatomic) RCTMarkdownStyle *markdownStyle;
+@property (nonatomic) NSNumber *parserId;
 @property (nonatomic) NSMutableArray<NSDictionary *> *blockquoteRangesAndLevels;
 
 - (NSAttributedString *)parseMarkdown:(nullable NSAttributedString *)input withAttributes:(nullable NSDictionary<NSAttributedStringKey, id>*)attributes;

package/apple/RCTMarkdownUtils.mm

@@ -1,18 +1,16 @@
 #import <RNLiveMarkdown/RCTMarkdownUtils.h>
+#import <RNLiveMarkdown/MarkdownGlobal.h>
 #import "react_native_assert.h"
 #import <React/RCTAssert.h>
 #import <React/RCTFont.h>
-
 #include <jsi/jsi.h>
-#include <hermes/hermes.h>
-
-using namespace facebook;
 
 @implementation RCTMarkdownUtils {
   NSString *_prevInputString;
   NSAttributedString *_prevAttributedString;
   NSDictionary<NSAttributedStringKey, id> *_prevTextAttributes;
   __weak RCTMarkdownStyle *_prevMarkdownStyle;
+  __weak NSNumber *_prevParserId;
 }
 
 - (NSAttributedString *)parseMarkdown:(nullable NSAttributedString *)input withAttributes:(nullable NSDictionary<NSAttributedStringKey,id> *)attributes
@@ -23,64 +21,64 @@ using namespace facebook;
         }
 
         NSString *inputString = [input string];
-        if ([inputString isEqualToString:_prevInputString] && [attributes isEqualToDictionary:_prevTextAttributes] && [_markdownStyle isEqual:_prevMarkdownStyle]) {
+        if ([inputString isEqualToString:_prevInputString] && [attributes isEqualToDictionary:_prevTextAttributes] && [_markdownStyle isEqual:_prevMarkdownStyle] && [_parserId isEqualToNumber:_prevParserId]) {
             return _prevAttributedString;
         }
 
-        static std::shared_ptr<jsi::Runtime> runtime;
         static std::mutex runtimeMutex;
         auto lock = std::lock_guard<std::mutex>(runtimeMutex);
 
-        if (runtime == nullptr) {
-            NSString *path = [[NSBundle mainBundle] pathForResource:@"react-native-live-markdown-parser" ofType:@"js"];
-            assert(path != nil && "[react-native-live-markdown] Markdown parser bundle not found");
-            NSString *content = [NSString stringWithContentsOfFile:path encoding:NSUTF8StringEncoding error:NULL];
-            assert(content != nil && "[react-native-live-markdown] Markdown parser bundle is empty");
-            runtime = facebook::hermes::makeHermesRuntime();
-            auto codeBuffer = std::make_shared<const jsi::StringBuffer>([content UTF8String]);
-            runtime->evaluateJavaScript(codeBuffer, "evaluateJavaScript");
-        }
+        auto markdownRuntime = expensify::livemarkdown::getMarkdownRuntime();
+        jsi::Runtime &rt = markdownRuntime->getJSIRuntime();
 
-        jsi::Runtime &rt = *runtime;
-        auto text = jsi::String::createFromUtf8(rt, [inputString UTF8String]);
+        auto markdownWorklet = expensify::livemarkdown::getMarkdownWorklet([_parserId intValue]);
 
-        auto func = rt.global().getPropertyAsFunction(rt, "parseExpensiMarkToRanges");
-        auto output = func.call(rt, text);
-        if (output.isUndefined()) {
-          return input;
-        }
-        const auto &ranges = output.asObject(rt).asArray(rt);
+        try {
+            const auto &text = jsi::String::createFromUtf8(rt, [inputString UTF8String]);
+            const auto &output = markdownRuntime->runGuarded(markdownWorklet, text);
+            const auto &ranges = output.asObject(rt).asArray(rt);
 
-        NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:inputString attributes:attributes];
-        [attributedString beginEditing];
+            NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:inputString attributes:attributes];
+            [attributedString beginEditing];
 
-        // If the attributed string ends with underlined text, blurring the single-line input imprints the underline style across the whole string.
-        // It looks like a bug in iOS, as there is no underline style to be found in the attributed string, especially after formatting.
-        // This is a workaround that applies the NSUnderlineStyleNone to the string before iterating over ranges which resolves this problem.
-        [attributedString addAttribute:NSUnderlineStyleAttributeName value:[NSNumber numberWithInteger:NSUnderlineStyleNone] range:NSMakeRange(0, attributedString.length)];
+            // If the attributed string ends with underlined text, blurring the single-line input imprints the underline style across the whole string.
+            // It looks like a bug in iOS, as there is no underline style to be found in the attributed string, especially after formatting.
+            // This is a workaround that applies the NSUnderlineStyleNone to the string before iterating over ranges which resolves this problem.
+            [attributedString addAttribute:NSUnderlineStyleAttributeName value:[NSNumber numberWithInteger:NSUnderlineStyleNone] range:NSMakeRange(0, attributedString.length)];
 
-        _blockquoteRangesAndLevels = [NSMutableArray new];
+            _blockquoteRangesAndLevels = [NSMutableArray new];
 
-        for (size_t i = 0, n = ranges.size(rt); i < n; ++i) {
-            const auto &item = ranges.getValueAtIndex(rt, i).asObject(rt);
-            const auto &type = item.getProperty(rt, "type").asString(rt).utf8(rt);
-            const auto &start = static_cast<int>(item.getProperty(rt, "start").asNumber());
-            const auto &length = static_cast<int>(item.getProperty(rt, "length").asNumber());
-            const auto &depth = item.hasProperty(rt, "depth") ? static_cast<int>(item.getProperty(rt, "depth").asNumber()) : 1;
+            for (size_t i = 0, n = ranges.size(rt); i < n; ++i) {
+                const auto &item = ranges.getValueAtIndex(rt, i).asObject(rt);
+                const auto &type = item.getProperty(rt, "type").asString(rt).utf8(rt);
+                const auto &start = static_cast<int>(item.getProperty(rt, "start").asNumber());
+                const auto &length = static_cast<int>(item.getProperty(rt, "length").asNumber());
+                const auto &depth = item.hasProperty(rt, "depth") ? static_cast<int>(item.getProperty(rt, "depth").asNumber()) : 1;
 
-            [self applyRangeToAttributedString:attributedString type:type start:start length:length depth:depth];
-        }
+                [self applyRangeToAttributedString:attributedString type:type start:start length:length depth:depth];
+            }
 
-        RCTApplyBaselineOffset(attributedString);
+            RCTApplyBaselineOffset(attributedString);
 
-        [attributedString endEditing];
+            [attributedString endEditing];
 
-        _prevInputString = inputString;
-        _prevAttributedString = attributedString;
-        _prevTextAttributes = attributes;
-        _prevMarkdownStyle = _markdownStyle;
+            _prevInputString = inputString;
+            _prevAttributedString = attributedString;
+            _prevTextAttributes = attributes;
+            _prevMarkdownStyle = _markdownStyle;
+            _prevParserId = _parserId;
 
-        return attributedString;
+            return attributedString;
+        } catch (const jsi::JSError &error) {
+            RCTLogWarn(@"[react-native-live-markdown] Incorrect schema of worklet parser output: %s", error.getMessage().c_str());
+            NSAttributedString *attributedString = [[NSAttributedString alloc] initWithString:inputString attributes:attributes];
+            _prevInputString = inputString;
+            _prevAttributedString = attributedString;
+            _prevTextAttributes = attributes;
+            _prevMarkdownStyle = _markdownStyle;
+            _prevParserId = _parserId;
+            return attributedString;
+        }
     }
 }
 

package/cpp/MarkdownGlobal.cpp

@@ -0,0 +1,45 @@
+#include "MarkdownGlobal.h"
+
+#include <unordered_map>
+
+using namespace facebook;
+
+namespace expensify {
+namespace livemarkdown {
+
+std::shared_ptr<WorkletRuntime> globalMarkdownWorkletRuntime;
+
+void setMarkdownRuntime(const std::shared_ptr<WorkletRuntime> &markdownWorkletRuntime) {
+  globalMarkdownWorkletRuntime = markdownWorkletRuntime;
+}
+
+std::shared_ptr<WorkletRuntime> getMarkdownRuntime() {
+  return globalMarkdownWorkletRuntime;
+}
+
+std::unordered_map<int, std::shared_ptr<ShareableWorklet>> globalMarkdownShareableWorklets;
+std::mutex globalMarkdownShareableWorkletsMutex;
+int nextParserId = 1;
+
+const int registerMarkdownWorklet(const std::shared_ptr<ShareableWorklet> &markdownWorklet) {
+  assert(markdownWorklet != nullptr);
+  auto parserId = nextParserId++;
+  std::unique_lock<std::mutex> lock(globalMarkdownShareableWorkletsMutex);
+  globalMarkdownShareableWorklets[parserId] = markdownWorklet;
+  return parserId;
+}
+
+void unregisterMarkdownWorklet(const int parserId) {
+  std::unique_lock<std::mutex> lock(globalMarkdownShareableWorkletsMutex);
+  globalMarkdownShareableWorklets.erase(parserId);
+}
+
+std::shared_ptr<ShareableWorklet> getMarkdownWorklet(const int parserId) {
+  std::unique_lock<std::mutex> lock(globalMarkdownShareableWorkletsMutex);
+  const auto &worklet = globalMarkdownShareableWorklets[parserId];
+  assert(worklet != nullptr);
+  return worklet;
+}
+
+} // namespace livemarkdown
+} // namespace expensify

package/cpp/MarkdownGlobal.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#include <jsi/jsi.h>
+
+#include <worklets/WorkletRuntime/WorkletRuntime.h>
+
+using namespace facebook;
+using namespace worklets;
+
+namespace expensify {
+namespace livemarkdown {
+
+void setMarkdownRuntime(const std::shared_ptr<WorkletRuntime> &markdownWorkletRuntime);
+
+std::shared_ptr<WorkletRuntime> getMarkdownRuntime();
+
+const int registerMarkdownWorklet(const std::shared_ptr<ShareableWorklet> &markdownWorklet);
+
+void unregisterMarkdownWorklet(const int parserId);
+
+std::shared_ptr<ShareableWorklet> getMarkdownWorklet(const int parserId);
+
+} // namespace livemarkdown
+} // namespace expensify

package/cpp/RuntimeDecorator.cpp

@@ -0,0 +1,43 @@
+#include "RuntimeDecorator.h"
+#include "MarkdownGlobal.h"
+
+using namespace facebook;
+using namespace worklets;
+
+namespace expensify {
+namespace livemarkdown {
+
+void injectJSIBindings(jsi::Runtime &rt) {
+
+  rt.global().setProperty(rt, "jsi_setMarkdownRuntime", jsi::Function::createFromHostFunction(
+      rt,
+      jsi::PropNameID::forAscii(rt, "jsi_setMarkdownRuntime"),
+      1,
+      [](jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) -> jsi::Value {
+        setMarkdownRuntime(extractWorkletRuntime(rt, args[0]));
+        return jsi::Value::undefined();
+      }));
+
+  rt.global().setProperty(rt, "jsi_registerMarkdownWorklet", jsi::Function::createFromHostFunction(
+      rt,
+      jsi::PropNameID::forAscii(rt, "jsi_registerMarkdownWorklet"),
+      1,
+      [](jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) -> jsi::Value {
+        auto parserId = registerMarkdownWorklet(extractShareableOrThrow<ShareableWorklet>(rt, args[0]));
+        return jsi::Value(parserId);
+      }));
+
+  rt.global().setProperty(rt, "jsi_unregisterMarkdownWorklet", jsi::Function::createFromHostFunction(
+      rt,
+      jsi::PropNameID::forAscii(rt, "jsi_unregisterMarkdownWorklet"),
+      1,
+      [](jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) -> jsi::Value {
+        auto parserId = static_cast<int>(args[0].asNumber());
+        unregisterMarkdownWorklet(parserId);
+        return jsi::Value::undefined();
+      }));
+
+}
+
+} // namespace livemarkdown
+} // namespace expensify

package/cpp/RuntimeDecorator.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#include <jsi/jsi.h>
+
+using namespace facebook;
+
+namespace expensify {
+namespace livemarkdown {
+
+void injectJSIBindings(jsi::Runtime &rt);
+
+} // namespace livemarkdown
+} // namespace expensify

package/lib/commonjs/MarkdownTextInput.js

@@ -6,13 +6,37 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _reactNative = require("react-native");
 var _react = _interopRequireDefault(require("react"));
+var _reactNativeReanimated = require("react-native-reanimated");
 var _MarkdownTextInputDecoratorViewNativeComponent = _interopRequireDefault(require("./MarkdownTextInputDecoratorViewNativeComponent"));
 var _NativeLiveMarkdownModule = _interopRequireDefault(require("./NativeLiveMarkdownModule"));
 var _styleUtils = require("./styleUtils");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
-if (_NativeLiveMarkdownModule.default) {
+let initialized = false;
+let workletRuntime;
+function initializeLiveMarkdownIfNeeded() {
+  if (initialized) {
+    return;
+  }
+  if (!_NativeLiveMarkdownModule.default) {
+    throw new Error('[react-native-live-markdown] NativeLiveMarkdownModule is not available');
+  }
   _NativeLiveMarkdownModule.default.install();
+  if (!global.jsi_setMarkdownRuntime) {
+    throw new Error('[react-native-live-markdown] global.jsi_setMarkdownRuntime is not available');
+  }
+  workletRuntime = (0, _reactNativeReanimated.createWorkletRuntime)('LiveMarkdownRuntime');
+  global.jsi_setMarkdownRuntime(workletRuntime);
+  initialized = true;
+}
+function registerParser(parser) {
+  initializeLiveMarkdownIfNeeded();
+  const shareableWorklet = (0, _reactNativeReanimated.makeShareableCloneRecursive)(parser);
+  const parserId = global.jsi_registerMarkdownWorklet(shareableWorklet);
+  return parserId;
+}
+function unregisterParser(parserId) {
+  global.jsi_unregisterMarkdownWorklet(parserId);
 }
 function processColorsInMarkdownStyle(input) {
   const output = JSON.parse(JSON.stringify(input));
@@ -34,11 +58,28 @@ function processMarkdownStyle(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');
+  }
+
+  // eslint-disable-next-line no-underscore-dangle
+  const workletHash = props.parser.__workletHash;
+  if (workletHash === undefined) {
+    throw new Error('[react-native-live-markdown] `parser` is not a worklet');
+  }
+  const parserId = _react.default.useMemo(() => {
+    return registerParser(props.parser);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [workletHash]);
+  _react.default.useEffect(() => {
+    return () => unregisterParser(parserId);
+  }, [parserId]);
   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,
-    markdownStyle: markdownStyle
+    markdownStyle: markdownStyle,
+    parserId: parserId
   }));
 });
 const styles = _reactNative.StyleSheet.create({

package/lib/commonjs/MarkdownTextInput.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_react","_interopRequireDefault","_MarkdownTextInputDecoratorViewNativeComponent","_NativeLiveMarkdownModule","_styleUtils","e","__esModule","default","_extends","Object","assign","bind","n","arguments","length","t","r","hasOwnProperty","call","apply","NativeLiveMarkdownModule","install","processColorsInMarkdownStyle","input","output","JSON","parse","stringify","keys","forEach","key","obj","prop","endsWith","processColor","processMarkdownStyle","mergeMarkdownStyleWithDefault","MarkdownTextInput","React","forwardRef","props","ref","IS_FABRIC","global","markdownStyle","useMemo","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","initializeLiveMarkdownIfNeeded","NativeLiveMarkdownModule","Error","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","undefined","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":[]}

package/lib/commonjs/MarkdownTextInput.web.js

@@ -18,7 +18,6 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-require('../parser/react-native-live-markdown-parser.js');
 const useClientEffect = typeof window === 'undefined' ? _react.useEffect : _react.useLayoutEffect;
 let focusTimeout = null;
 const MarkdownTextInput = /*#__PURE__*/_react.default.forwardRef(({
@@ -34,6 +33,7 @@ const MarkdownTextInput = /*#__PURE__*/_react.default.forwardRef(({
   numberOfLines,
   multiline = false,
   markdownStyle,
+  parser,
   onBlur,
   onChange,
   onChangeText,
@@ -58,6 +58,12 @@ const MarkdownTextInput = /*#__PURE__*/_react.default.forwardRef(({
   addAuthTokenToImageURLCallback,
   imagePreviewAuthRequiredURLs
 }, ref) => {
+  if (parser === undefined) {
+    throw new Error('[react-native-live-markdown] `parser` is undefined');
+  }
+  if (typeof parser !== 'function') {
+    throw new Error('[react-native-live-markdown] `parser` is not a function');
+  }
   const compositionRef = (0, _react.useRef)(false);
   const divRef = (0, _react.useRef)(null);
   const currentlyFocusedField = (0, _react.useRef)(null);
@@ -87,7 +93,7 @@ const MarkdownTextInput = /*#__PURE__*/_react.default.forwardRef(({
     }
     return e;
   }, []);
-  const parseText = (0, _react.useCallback)((target, text, customMarkdownStyles, cursorPosition = null, shouldAddToHistory = true, shouldForceDOMUpdate = false, shouldScrollIntoView = false) => {
+  const parseText = (0, _react.useCallback)((parserFunction, target, text, customMarkdownStyles, cursorPosition = null, shouldAddToHistory = true, shouldForceDOMUpdate = false, shouldScrollIntoView = false) => {
     if (!divRef.current) {
       return {
         text: text || '',
@@ -100,7 +106,7 @@ const MarkdownTextInput = /*#__PURE__*/_react.default.forwardRef(({
         cursorPosition: null
       };
     }
-    const parsedText = (0, _parserUtils.updateInputStructure)(target, text, cursorPosition, multiline, customMarkdownStyles, false, shouldForceDOMUpdate, shouldScrollIntoView, {
+    const parsedText = (0, _parserUtils.updateInputStructure)(parserFunction, target, text, cursorPosition, multiline, customMarkdownStyles, false, shouldForceDOMUpdate, shouldScrollIntoView, {
       addAuthTokenToImageURLCallback,
       imagePreviewAuthRequiredURLs
     });
@@ -113,10 +119,10 @@ const MarkdownTextInput = /*#__PURE__*/_react.default.forwardRef(({
   const processedMarkdownStyle = (0, _react.useMemo)(() => {
     const newMarkdownStyle = (0, _webStyleUtils.processMarkdownStyle)(markdownStyle);
     if (divRef.current) {
-      parseText(divRef.current, divRef.current.value, newMarkdownStyle, null, false, false);
+      parseText(parser, divRef.current, divRef.current.value, newMarkdownStyle, null, false, false);
     }
     return newMarkdownStyle;
-  }, [markdownStyle, parseText]);
+  }, [parser, markdownStyle, parseText]);
   const inputStyles = (0, _react.useMemo)(() => _reactNative.StyleSheet.flatten([styles.defaultInputStyles, flattenedStyle && {
     caretColor: flattenedStyle.color || 'black'
   }, {
@@ -131,8 +137,8 @@ const MarkdownTextInput = /*#__PURE__*/_react.default.forwardRef(({
     }
     const item = history.current.undo();
     const undoValue = item ? item.text : null;
-    return parseText(target, undoValue, processedMarkdownStyle, item ? item.cursorPosition : null, false);
-  }, [parseText, processedMarkdownStyle]);
+    return parseText(parser, target, undoValue, processedMarkdownStyle, item ? item.cursorPosition : null, false);
+  }, [parser, parseText, processedMarkdownStyle]);
   const redo = (0, _react.useCallback)(target => {
     if (!history.current) {
       return {
@@ -142,8 +148,8 @@ const MarkdownTextInput = /*#__PURE__*/_react.default.forwardRef(({
     }
     const item = history.current.redo();
     const redoValue = item ? item.text : null;
-    return parseText(target, redoValue, processedMarkdownStyle, item ? item.cursorPosition : null, false);
-  }, [parseText, processedMarkdownStyle]);
+    return parseText(parser, target, redoValue, processedMarkdownStyle, item ? item.cursorPosition : null, false);
+  }, [parser, parseText, processedMarkdownStyle]);
 
   // Placeholder text color logic
   const updateTextColor = (0, _react.useCallback)((node, text) => {
@@ -255,7 +261,7 @@ const MarkdownTextInput = /*#__PURE__*/_react.default.forwardRef(({
         newInputUpdate = redo(divRef.current);
         break;
       default:
-        newInputUpdate = parseText(divRef.current, parsedText, processedMarkdownStyle, newCursorPosition, true, !inputType, inputType === 'pasteText');
+        newInputUpdate = parseText(parser, divRef.current, parsedText, processedMarkdownStyle, newCursorPosition, true, !inputType, inputType === 'pasteText');
     }
     const {
       text,
@@ -299,7 +305,7 @@ const MarkdownTextInput = /*#__PURE__*/_react.default.forwardRef(({
       onChangeText(text);
     }
     handleContentSizeChange();
-  }, [updateTextColor, updateSelection, onChange, onChangeText, handleContentSizeChange, undo, redo, parseText, processedMarkdownStyle, setEventProps, maxLength]);
+  }, [parser, updateTextColor, updateSelection, onChange, onChangeText, handleContentSizeChange, undo, redo, parseText, processedMarkdownStyle, setEventProps, maxLength]);
   const insertText = (0, _react.useCallback)((e, text) => {
     if (!contentSelection.current || !divRef.current) {
       return;
@@ -490,14 +496,14 @@ const MarkdownTextInput = /*#__PURE__*/_react.default.forwardRef(({
       return;
     }
     if (value === undefined) {
-      parseText(divRef.current, divRef.current.value, processedMarkdownStyle);
+      parseText(parser, divRef.current, divRef.current.value, processedMarkdownStyle);
       return;
     }
     const normalizedValue = (0, _inputUtils.normalizeValue)(value);
     divRef.current.value = normalizedValue;
-    parseText(divRef.current, normalizedValue, processedMarkdownStyle, null, true, false, true);
+    parseText(parser, divRef.current, normalizedValue, processedMarkdownStyle, null, true, false, true);
     updateTextColor(divRef.current, value);
-  }, [multiline, processedMarkdownStyle, value, maxLength]);
+  }, [parser, multiline, processedMarkdownStyle, value, maxLength]);
   useClientEffect(function adjustHeight() {
     if (!divRef.current || !multiline) {
       return;