react-native-enriched-markdown-scaffold 0.7.4-scaffold.1 → 0.7.4-scaffold.11

package/android/build.gradle

@@ -67,6 +67,10 @@ android {
       }
     }
   }
+
+  testOptions {
+    unitTests.includeAndroidResources = true
+  }
 }
 
 repositories {
@@ -85,6 +89,7 @@ dependencies {
   if (enableMath) {
     implementation("io.github.erweixin:ratex-android:0.1.10")
   }
+  testImplementation "junit:junit:4.13.2"
 }
 
 react {

package/android/generated/java/com/facebook/react/viewmanagers/EnrichedMarkdownTextInputManagerDelegate.java

@@ -44,9 +44,15 @@ public class EnrichedMarkdownTextInputManagerDelegate<T extends View, U extends
       case "scrollEnabled":
         mViewManager.setScrollEnabled(view, value == null ? false : (boolean) value);
         break;
+      case "blockSyntax":
+        mViewManager.setBlockSyntax(view, value == null ? false : (boolean) value);
+        break;
       case "autoCapitalize":
         mViewManager.setAutoCapitalize(view, value == null ? null : (String) value);
         break;
+      case "interceptPaste":
+        mViewManager.setInterceptPaste(view, value == null ? false : (boolean) value);
+        break;
       case "multiline":
         mViewManager.setMultiline(view, value == null ? false : (boolean) value);
         break;
@@ -157,6 +163,9 @@ public class EnrichedMarkdownTextInputManagerDelegate<T extends View, U extends
       case "copyToClipboard":
         mViewManager.copyToClipboard(view);
         break;
+      case "resolvePaste":
+        mViewManager.resolvePaste(view, args.getString(0), args.getString(1));
+        break;
       case "requestMarkdown":
         mViewManager.requestMarkdown(view, args.getInt(0));
         break;

package/android/generated/java/com/facebook/react/viewmanagers/EnrichedMarkdownTextInputManagerInterface.java

@@ -22,7 +22,9 @@ public interface EnrichedMarkdownTextInputManagerInterface<T extends View> exten
   void setEditable(T view, boolean value);
   void setAutoFocus(T view, boolean value);
   void setScrollEnabled(T view, boolean value);
+  void setBlockSyntax(T view, boolean value);
   void setAutoCapitalize(T view, @Nullable String value);
+  void setInterceptPaste(T view, boolean value);
   void setMultiline(T view, boolean value);
   void setCursorColor(T view, @Nullable Integer value);
   void setSelectionColor(T view, @Nullable Integer value);
@@ -57,6 +59,7 @@ public interface EnrichedMarkdownTextInputManagerInterface<T extends View> exten
   void updateMath(T view, int start, String latex, boolean displayMode);
   void removeMath(T view, int start);
   void copyToClipboard(T view);
+  void resolvePaste(T view, String text, String markdown);
   void requestMarkdown(T view, int requestId);
   void requestCaretRect(T view, int requestId);
 }

package/android/generated/jni/react/renderer/components/EnrichedMarkdownTextSpec/EventEmitters.cpp

@@ -247,6 +247,16 @@ payload.setProperty(runtime, "height", event.height);
 }
 
 
+void EnrichedMarkdownTextInputEventEmitter::onPaste(OnPaste event) const {
+  dispatchEvent("paste", [event=std::move(event)](jsi::Runtime &runtime) {
+    auto payload = jsi::Object(runtime);
+    payload.setProperty(runtime, "text", event.text);
+payload.setProperty(runtime, "markdown", event.markdown);
+    return payload;
+  });
+}
+
+
 void EnrichedMarkdownTextInputEventEmitter::onStartMention(OnStartMention event) const {
   dispatchEvent("startMention", [event=std::move(event)](jsi::Runtime &runtime) {
     auto payload = jsi::Object(runtime);

package/android/generated/jni/react/renderer/components/EnrichedMarkdownTextSpec/EventEmitters.h

@@ -182,6 +182,11 @@ class EnrichedMarkdownTextInputEventEmitter : public ViewEventEmitter {
     double height;
     };
 
+  struct OnPaste {
+      std::string text;
+    std::string markdown;
+    };
+
   struct OnStartMention {
       std::string indicator;
     };
@@ -218,6 +223,8 @@ class EnrichedMarkdownTextInputEventEmitter : public ViewEventEmitter {
 
   void onMathPress(OnMathPress value) const;
 
+  void onPaste(OnPaste value) const;
+
   void onStartMention(OnStartMention value) const;
 
   void onChangeMention(OnChangeMention value) const;

package/android/generated/jni/react/renderer/components/EnrichedMarkdownTextSpec/Props.cpp

@@ -144,7 +144,9 @@ EnrichedMarkdownTextInputProps::EnrichedMarkdownTextInputProps(
     editable(convertRawProp(context, rawProps, "editable", sourceProps.editable, {false})),
     autoFocus(convertRawProp(context, rawProps, "autoFocus", sourceProps.autoFocus, {false})),
     scrollEnabled(convertRawProp(context, rawProps, "scrollEnabled", sourceProps.scrollEnabled, {false})),
+    blockSyntax(convertRawProp(context, rawProps, "blockSyntax", sourceProps.blockSyntax, {false})),
     autoCapitalize(convertRawProp(context, rawProps, "autoCapitalize", sourceProps.autoCapitalize, {})),
+    interceptPaste(convertRawProp(context, rawProps, "interceptPaste", sourceProps.interceptPaste, {false})),
     multiline(convertRawProp(context, rawProps, "multiline", sourceProps.multiline, {false})),
     cursorColor(convertRawProp(context, rawProps, "cursorColor", sourceProps.cursorColor, {})),
     selectionColor(convertRawProp(context, rawProps, "selectionColor", sourceProps.selectionColor, {})),
@@ -202,10 +204,18 @@ folly::dynamic EnrichedMarkdownTextInputProps::getDiffProps(
     result["scrollEnabled"] = scrollEnabled;
   }
     
+  if (blockSyntax != oldProps->blockSyntax) {
+    result["blockSyntax"] = blockSyntax;
+  }
+    
   if (autoCapitalize != oldProps->autoCapitalize) {
     result["autoCapitalize"] = autoCapitalize;
   }
     
+  if (interceptPaste != oldProps->interceptPaste) {
+    result["interceptPaste"] = interceptPaste;
+  }
+    
   if (multiline != oldProps->multiline) {
     result["multiline"] = multiline;
   }

package/android/generated/jni/react/renderer/components/EnrichedMarkdownTextSpec/Props.h

@@ -1534,6 +1534,7 @@ struct EnrichedMarkdownMarkdownStyleMathStruct {
   Float marginTop{0.0};
   Float marginBottom{0.0};
   std::string textAlign{};
+  std::string fontWeight{};
 
 
 #ifdef RN_SERIALIZABLE_STATE
@@ -1548,6 +1549,7 @@ struct EnrichedMarkdownMarkdownStyleMathStruct {
     result["marginTop"] = marginTop;
     result["marginBottom"] = marginBottom;
     result["textAlign"] = textAlign;
+    result["fontWeight"] = fontWeight;
     return result;
   }
 #endif
@@ -1584,6 +1586,10 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
   if (tmp_textAlign != map.end()) {
     fromRawValue(context, tmp_textAlign->second, result.textAlign);
   }
+  auto tmp_fontWeight = map.find("fontWeight");
+  if (tmp_fontWeight != map.end()) {
+    fromRawValue(context, tmp_fontWeight->second, result.fontWeight);
+  }
 }
 
 static inline std::string toString(const EnrichedMarkdownMarkdownStyleMathStruct &value) {
@@ -1598,6 +1604,8 @@ static inline folly::dynamic toDynamic(const EnrichedMarkdownMarkdownStyleMathSt
 
 struct EnrichedMarkdownMarkdownStyleInlineMathStruct {
   SharedColor color{};
+  Float paddingVertical{0.0};
+  std::string fontWeight{};
 
 
 #ifdef RN_SERIALIZABLE_STATE
@@ -1606,6 +1614,8 @@ struct EnrichedMarkdownMarkdownStyleInlineMathStruct {
   folly::dynamic toDynamic() const {
     folly::dynamic result = folly::dynamic::object();
     result["color"] = ::facebook::react::toDynamic(color);
+    result["paddingVertical"] = paddingVertical;
+    result["fontWeight"] = fontWeight;
     return result;
   }
 #endif
@@ -1618,6 +1628,14 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
   if (tmp_color != map.end()) {
     fromRawValue(context, tmp_color->second, result.color);
   }
+  auto tmp_paddingVertical = map.find("paddingVertical");
+  if (tmp_paddingVertical != map.end()) {
+    fromRawValue(context, tmp_paddingVertical->second, result.paddingVertical);
+  }
+  auto tmp_fontWeight = map.find("fontWeight");
+  if (tmp_fontWeight != map.end()) {
+    fromRawValue(context, tmp_fontWeight->second, result.fontWeight);
+  }
 }
 
 static inline std::string toString(const EnrichedMarkdownMarkdownStyleInlineMathStruct &value) {
@@ -2804,6 +2822,7 @@ struct EnrichedMarkdownTextInputMarkdownStyleMathStruct {
   Float paddingVertical{0.0};
   SharedColor selectedBackgroundColor{};
   SharedColor selectedBorderColor{};
+  std::string fontWeight{};
 
 
 #ifdef RN_SERIALIZABLE_STATE
@@ -2821,6 +2840,7 @@ struct EnrichedMarkdownTextInputMarkdownStyleMathStruct {
     result["paddingVertical"] = paddingVertical;
     result["selectedBackgroundColor"] = ::facebook::react::toDynamic(selectedBackgroundColor);
     result["selectedBorderColor"] = ::facebook::react::toDynamic(selectedBorderColor);
+    result["fontWeight"] = fontWeight;
     return result;
   }
 #endif
@@ -2869,6 +2889,10 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
   if (tmp_selectedBorderColor != map.end()) {
     fromRawValue(context, tmp_selectedBorderColor->second, result.selectedBorderColor);
   }
+  auto tmp_fontWeight = map.find("fontWeight");
+  if (tmp_fontWeight != map.end()) {
+    fromRawValue(context, tmp_fontWeight->second, result.fontWeight);
+  }
 }
 
 static inline std::string toString(const EnrichedMarkdownTextInputMarkdownStyleMathStruct &value) {
@@ -2892,6 +2916,7 @@ struct EnrichedMarkdownTextInputMarkdownStyleMathBlockStruct {
   Float paddingVertical{0.0};
   SharedColor selectedBackgroundColor{};
   SharedColor selectedBorderColor{};
+  std::string fontWeight{};
   Float marginTop{0.0};
   Float marginBottom{0.0};
   std::string alignment{};
@@ -2912,6 +2937,7 @@ struct EnrichedMarkdownTextInputMarkdownStyleMathBlockStruct {
     result["paddingVertical"] = paddingVertical;
     result["selectedBackgroundColor"] = ::facebook::react::toDynamic(selectedBackgroundColor);
     result["selectedBorderColor"] = ::facebook::react::toDynamic(selectedBorderColor);
+    result["fontWeight"] = fontWeight;
     result["marginTop"] = marginTop;
     result["marginBottom"] = marginBottom;
     result["alignment"] = alignment;
@@ -2963,6 +2989,10 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
   if (tmp_selectedBorderColor != map.end()) {
     fromRawValue(context, tmp_selectedBorderColor->second, result.selectedBorderColor);
   }
+  auto tmp_fontWeight = map.find("fontWeight");
+  if (tmp_fontWeight != map.end()) {
+    fromRawValue(context, tmp_fontWeight->second, result.fontWeight);
+  }
   auto tmp_marginTop = map.find("marginTop");
   if (tmp_marginTop != map.end()) {
     fromRawValue(context, tmp_marginTop->second, result.marginTop);
@@ -3329,7 +3359,9 @@ class EnrichedMarkdownTextInputProps final : public ViewProps {
   bool editable{false};
   bool autoFocus{false};
   bool scrollEnabled{false};
+  bool blockSyntax{false};
   std::string autoCapitalize{};
+  bool interceptPaste{false};
   bool multiline{false};
   SharedColor cursorColor{};
   SharedColor selectionColor{};
@@ -4872,6 +4904,7 @@ struct EnrichedMarkdownTextMarkdownStyleMathStruct {
   Float marginTop{0.0};
   Float marginBottom{0.0};
   std::string textAlign{};
+  std::string fontWeight{};
 
 
 #ifdef RN_SERIALIZABLE_STATE
@@ -4886,6 +4919,7 @@ struct EnrichedMarkdownTextMarkdownStyleMathStruct {
     result["marginTop"] = marginTop;
     result["marginBottom"] = marginBottom;
     result["textAlign"] = textAlign;
+    result["fontWeight"] = fontWeight;
     return result;
   }
 #endif
@@ -4922,6 +4956,10 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
   if (tmp_textAlign != map.end()) {
     fromRawValue(context, tmp_textAlign->second, result.textAlign);
   }
+  auto tmp_fontWeight = map.find("fontWeight");
+  if (tmp_fontWeight != map.end()) {
+    fromRawValue(context, tmp_fontWeight->second, result.fontWeight);
+  }
 }
 
 static inline std::string toString(const EnrichedMarkdownTextMarkdownStyleMathStruct &value) {
@@ -4936,6 +4974,8 @@ static inline folly::dynamic toDynamic(const EnrichedMarkdownTextMarkdownStyleMa
 
 struct EnrichedMarkdownTextMarkdownStyleInlineMathStruct {
   SharedColor color{};
+  Float paddingVertical{0.0};
+  std::string fontWeight{};
 
 
 #ifdef RN_SERIALIZABLE_STATE
@@ -4944,6 +4984,8 @@ struct EnrichedMarkdownTextMarkdownStyleInlineMathStruct {
   folly::dynamic toDynamic() const {
     folly::dynamic result = folly::dynamic::object();
     result["color"] = ::facebook::react::toDynamic(color);
+    result["paddingVertical"] = paddingVertical;
+    result["fontWeight"] = fontWeight;
     return result;
   }
 #endif
@@ -4956,6 +4998,14 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
   if (tmp_color != map.end()) {
     fromRawValue(context, tmp_color->second, result.color);
   }
+  auto tmp_paddingVertical = map.find("paddingVertical");
+  if (tmp_paddingVertical != map.end()) {
+    fromRawValue(context, tmp_paddingVertical->second, result.paddingVertical);
+  }
+  auto tmp_fontWeight = map.find("fontWeight");
+  if (tmp_fontWeight != map.end()) {
+    fromRawValue(context, tmp_fontWeight->second, result.fontWeight);
+  }
 }
 
 static inline std::string toString(const EnrichedMarkdownTextMarkdownStyleInlineMathStruct &value) {

package/android/src/main/java/com/swmansion/enriched/markdown/MeasurementStore.kt

@@ -25,6 +25,7 @@ import com.swmansion.enriched.markdown.utils.common.RenderedSegment
 import com.swmansion.enriched.markdown.utils.common.StreamingMarkdownFilter
 import com.swmansion.enriched.markdown.utils.common.TableStreamingMode
 import com.swmansion.enriched.markdown.utils.common.getBooleanOrDefault
+import com.swmansion.enriched.markdown.utils.common.getFloatOrDefault
 import com.swmansion.enriched.markdown.utils.common.getMapOrNull
 import com.swmansion.enriched.markdown.utils.common.getStringOrDefault
 import com.swmansion.enriched.markdown.utils.common.splitASTIntoSegments
@@ -299,7 +300,6 @@ object MeasurementStore {
 
     // 2. Render & Measure
     val spannable = tryRenderMarkdown(markdown, styleMap, context, md4cFlags, allowFontScaling, maxFontSizeMultiplier)
-    spannable?.replaceMathSpansWithPlaceholders(context)
     val textToMeasure = spannable ?: markdown
     val (size, _) = measureWithLayout(width, textToMeasure, measurePaint, id)
 
@@ -420,7 +420,7 @@ object MeasurementStore {
 
         when (segment) {
           is RenderedSegment.Text -> {
-            segment.styledText.replaceMathSpansWithPlaceholders(context)
+            segment.styledText.replaceMathSpansWithPlaceholders(context, style.inlineMathStyle.paddingVertical)
 
             val layout = createStaticLayout(segment.styledText, fontSize, widthPx, id)
             totalHeightPx += layout.height
@@ -503,7 +503,9 @@ object MeasurementStore {
       val ast = Parser.shared.parseMarkdown(markdown, md4cFlags) ?: return null
       val style = StyleConfig(styleMap, context, allowFontScaling, maxFontSizeMultiplier)
       measureRenderer.configure(style, context)
-      measureRenderer.renderDocument(ast, null)
+      measureRenderer.renderDocument(ast, null).apply {
+        replaceMathSpansWithPlaceholders(context, style.inlineMathStyle.paddingVertical)
+      }
     } catch (e: Exception) {
       Log.w(TAG, "Failed to render markdown for measurement, falling back to raw text", e)
       null
@@ -517,7 +519,7 @@ object MeasurementStore {
     fontScale: Float,
     maxFontSizeMultiplier: Float,
   ): Float {
-    val fontSizeSp = styleMap?.getMap("paragraph")?.getDouble("fontSize")?.toFloat() ?: 16f
+    val fontSizeSp = styleMap.getMapOrNull("paragraph").getFloatOrDefault("fontSize", 16f)
     val density = context.resources.displayMetrics.density
 
     if (!allowFontScaling) {

package/android/src/main/java/com/swmansion/enriched/markdown/input/EnrichedMarkdownTextInputManager.kt

@@ -27,6 +27,7 @@ import com.swmansion.enriched.markdown.input.events.OnInputBlurEvent
 import com.swmansion.enriched.markdown.input.events.OnInputFocusEvent
 import com.swmansion.enriched.markdown.input.events.OnLinkDetectedEvent
 import com.swmansion.enriched.markdown.input.events.OnMathPressEvent
+import com.swmansion.enriched.markdown.input.events.OnPasteEvent
 import com.swmansion.enriched.markdown.input.events.OnRequestCaretRectResultEvent
 import com.swmansion.enriched.markdown.input.events.OnRequestMarkdownResultEvent
 import com.swmansion.enriched.markdown.input.events.OnStartMentionEvent
@@ -57,6 +58,13 @@ class EnrichedMarkdownTextInputManager :
     stateWrapper: StateWrapper?,
   ): Any? {
     view.stateWrapper = stateWrapper
+    // Fabric applies props before it hands over the state wrapper, so every layout
+    // invalidation raised during the mount transaction was dropped. Replay it now that we can
+    // actually push state — otherwise the shadow node keeps the initialMeasure() estimate,
+    // which ignores math chips, until the first keystroke.
+    if (stateWrapper != null) {
+      view.layoutManager.flushPendingInvalidation()
+    }
     return super.updateState(view, props, stateWrapper)
   }
 
@@ -69,6 +77,11 @@ class EnrichedMarkdownTextInputManager :
     view.dismissActiveMention()
     super.onDropViewInstance(view)
     view.layoutManager.release()
+    // Unreachable while view recycling is off — it needs a `setupViewRecycling()` call from this
+    // constructor *and* ReactNativeFeatureFlags.enableViewRecycling(). Kept because the flush
+    // above turns a recycled view into a view that pushes state at mount: without this, it would
+    // push into the shadow node it was dropped from.
+    view.stateWrapper = null
   }
 
   override fun measure(
@@ -100,6 +113,7 @@ class EnrichedMarkdownTextInputManager :
       OnContextMenuItemPressEvent.EVENT_NAME,
       OnLinkDetectedEvent.EVENT_NAME,
       OnMathPressEvent.EVENT_NAME,
+      OnPasteEvent.EVENT_NAME,
       OnStartMentionEvent.EVENT_NAME,
       OnChangeMentionEvent.EVENT_NAME,
       OnEndMentionEvent.EVENT_NAME,
@@ -158,6 +172,14 @@ class EnrichedMarkdownTextInputManager :
     view?.isVerticalScrollBarEnabled = value
   }
 
+  @ReactProp(name = "blockSyntax", defaultBoolean = true)
+  override fun setBlockSyntax(
+    view: EnrichedMarkdownTextInputView?,
+    value: Boolean,
+  ) {
+    view?.blockSyntax = value
+  }
+
   @ReactProp(name = "autoCapitalize")
   override fun setAutoCapitalize(
     view: EnrichedMarkdownTextInputView?,
@@ -166,6 +188,14 @@ class EnrichedMarkdownTextInputManager :
     view?.setAutoCapitalize(value)
   }
 
+  @ReactProp(name = "interceptPaste", defaultBoolean = false)
+  override fun setInterceptPaste(
+    view: EnrichedMarkdownTextInputView?,
+    value: Boolean,
+  ) {
+    view?.interceptPaste = value
+  }
+
   @ReactProp(name = "multiline", defaultBoolean = true)
   override fun setMultiline(
     view: EnrichedMarkdownTextInputView?,
@@ -497,6 +527,14 @@ class EnrichedMarkdownTextInputManager :
     view?.copyToClipboard()
   }
 
+  override fun resolvePaste(
+    view: EnrichedMarkdownTextInputView?,
+    text: String?,
+    markdown: String?,
+  ) {
+    view?.resolvePaste(text ?: "", markdown ?: "")
+  }
+
   override fun requestMarkdown(
     view: EnrichedMarkdownTextInputView?,
     requestId: Int,