react-native-enriched-markdown-scaffold 0.6.0-scaffold.8 → 0.7.4-scaffold.10

package/ReactNativeEnrichedMarkdown.podspec

@@ -2,6 +2,9 @@ require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
+monorepo = File.exist?(File.expand_path("../core/EnrichedMarkdownCore.podspec", __dir__))
+cpp_root = monorepo ? "$(PODS_TARGET_SRCROOT)/../core/cpp" : "$(PODS_TARGET_SRCROOT)/cpp"
+
 Pod::Spec.new do |s|
   s.name         = "ReactNativeEnrichedMarkdown"
   s.version      = package["version"]
@@ -13,13 +16,30 @@ Pod::Spec.new do |s|
   s.platforms    = { :ios => min_ios_version_supported, :osx => '14.0' }
   s.source       = { :git => "https://github.com/software-mansion/react-native-enriched-markdown.git", :tag => "#{s.version}" }
 
-  s.private_header_files = "ios/**/*.h", "cpp/**/*.{h,hpp}"
+  if monorepo
+    s.private_header_files = "ios/**/*.h"
+    s.source_files = "ios/**/*.{h,m,mm,cpp,swift}"
+    s.dependency "EnrichedMarkdownCore"
+  else
+    s.private_header_files = "ios/**/*.h", "cpp/**/*.{h,hpp}"
+    s.source_files = "ios/**/*.{h,m,mm,cpp,swift}", "cpp/md4c/*.{c,h}", "cpp/parser/*.{hpp,cpp}"
+  end
 
   # To disable LaTeX math rendering (RaTeX, iOS only), add ENV['ENRICHED_MARKDOWN_ENABLE_MATH'] = '0' to your Podfile.
   # When math is enabled, consumers must use `use_frameworks! :linkage => :dynamic` (required for SPM interop).
   enable_math = ENV['ENRICHED_MARKDOWN_ENABLE_MATH'] != '0'
 
-  s.source_files = "ios/**/*.{h,m,mm,cpp,swift}", "cpp/md4c/*.{c,h}", "cpp/parser/*.{hpp,cpp}"
+  # RaTeX is wired in through React Native's `spm_dependency` helper (SPM interop).
+  # On React Native versions that don't provide it, disable math entirely so the
+  # RaTeX-importing sources under ios/math are excluded from the build. Otherwise
+  # the failure would just move from `pod install` to a build-time
+  # "missing module 'RaTeX'" error.
+  if enable_math && !defined?(spm_dependency)
+    Pod::UI.warn '[ReactNativeEnrichedMarkdown] `spm_dependency` is unavailable in this ' \
+      'React Native version; disabling LaTeX math (RaTeX). Upgrade React Native to enable it.'
+    enable_math = false
+  end
+
   unless enable_math
     s.exclude_files = "ios/math/**/*.swift"
   end
@@ -27,22 +47,39 @@ Pod::Spec.new do |s|
   preprocessor_defs = '$(inherited) MD4C_USE_UTF8=1'
   if enable_math
     preprocessor_defs += ' ENRICHED_MARKDOWN_MATH=1'
-    if defined?(:spm_dependency)
-      spm_dependency(s,
-        url: 'https://github.com/erweixin/RaTeX.git',
-        requirement: {kind: 'upToNextMajorVersion', minimumVersion: '0.1.9'},
-        products: ['RaTeX']
-      )
-    end
+    spm_dependency(s,
+      url: 'https://github.com/erweixin/RaTeX.git',
+      requirement: {kind: 'upToNextMajorVersion', minimumVersion: '0.1.12'},
+      products: ['RaTeX']
+    )
   end
 
-  s.pod_target_xcconfig = {
-    'HEADER_SEARCH_PATHS' => '"$(PODS_TARGET_SRCROOT)/cpp/md4c" "$(PODS_TARGET_SRCROOT)/cpp/parser" "$(PODS_TARGET_SRCROOT)/ios/internals" "$(PODS_TARGET_SRCROOT)/ios/input/internals"',
+  pod_xcconfig = {
+    'HEADER_SEARCH_PATHS' => "\"#{cpp_root}/md4c\" \"#{cpp_root}/parser\" \"$(PODS_TARGET_SRCROOT)/ios/internals\" \"$(PODS_TARGET_SRCROOT)/ios/input/internals\"",
     'GCC_PREPROCESSOR_DEFINITIONS' => preprocessor_defs,
     'CLANG_CXX_LANGUAGE_STANDARD' => 'c++17',
     'DEFINES_MODULE' => 'YES'
   }
 
+  # Detect Apple Silicon on the host running `pod install`. `sysctl hw.optional.arm64`
+  # reports the real hardware even under a Rosetta-translated Ruby, unlike `uname -m`.
+  apple_silicon = `sysctl -n hw.optional.arm64 2>/dev/null`.strip == '1'
+
+  if enable_math && apple_silicon
+    # RaTeX's Swift wrapper is compiled from SPM source, so its RaTeX.swiftmodule
+    # is emitted only for the arch(es) the build requests. Under ONLY_ACTIVE_ARCH
+    # on Apple Silicon that is arm64 only, but universal simulator builds (archive,
+    # "Any iOS Simulator Device", Release) also compile this pod for x86_64 and then
+    # fail with "could not find module 'RaTeX' for target 'x86_64-apple-ios-simulator'".
+    # Excluding x86_64 for the simulator keeps the pod and the app target arch sets in
+    # sync. Guarded to Apple Silicon so Intel Macs (which build x86_64 simulator slices)
+    # are unaffected; `$(inherited)` preserves exclusions from the user project / other pods.
+    pod_xcconfig['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = '$(inherited) x86_64'
+    s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => '$(inherited) x86_64' }
+  end
+
+  s.pod_target_xcconfig = pod_xcconfig
+
   if enable_math
     # React Native's spm_dependency generates a module.modulemap at
     # ${BUILT_PRODUCTS_DIR}/include/ that re-declares RaTeXFFI, but the RaTeX
@@ -59,6 +96,20 @@ Pod::Spec.new do |s|
           sed -i '' -E '/^(framework )?module RaTeXFFI /,/^\}/d' "$MODULEMAP"
         SCRIPT
         execution_position: :before_compile
+      },
+      {
+        name: 'Dedupe RaTeX XCFramework Signature',
+        script: <<~'SCRIPT',
+          # Xcode 26 generates a .signature file for each signed XCFramework.
+          # When the RaTeX XCFramework is consumed via spm_dependency inside a
+          # CocoaPods target, both the SPM product and the pod target produce a
+          # copy. During archive assembly Xcode copies all signatures into a flat
+          # Signatures/ directory, and the second copy collides with the first.
+          # Removing the pod-target copy prevents the collision. This is a no-op
+          # on older Xcode versions or simulator builds where the file is absent.
+          rm -f "${CONFIGURATION_BUILD_DIR}/RaTeX.xcframework-ios.signature"
+        SCRIPT
+        execution_position: :after_compile
       }
     ]
   end

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/EnrichedMarkdownManagerDelegate.java

@@ -71,6 +71,9 @@ public class EnrichedMarkdownManagerDelegate<T extends View, U extends BaseViewM
       case "selectionMenuConfig":
         mViewManager.setSelectionMenuConfig(view, (ReadableMap) value);
         break;
+      case "accessibilityLabels":
+        mViewManager.setAccessibilityLabels(view, (ReadableMap) value);
+        break;
       case "textBreakStrategy":
         mViewManager.setTextBreakStrategy(view, value == null ? "highQuality" : (String) value);
         break;

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

@@ -31,6 +31,7 @@ public interface EnrichedMarkdownManagerInterface<T extends View> extends ViewMa
   void setSpoilerOverlay(T view, @Nullable String value);
   void setContextMenuItems(T view, @Nullable ReadableArray value);
   void setSelectionMenuConfig(T view, @Nullable ReadableMap value);
+  void setAccessibilityLabels(T view, @Nullable ReadableMap value);
   void setTextBreakStrategy(T view, @Nullable String value);
   void setLineBreakStrategyIOS(T view, @Nullable String value);
   void setWritingDirection(T view, @Nullable String value);

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

@@ -44,6 +44,9 @@ 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;
@@ -80,6 +83,12 @@ public class EnrichedMarkdownTextInputManagerDelegate<T extends View, U extends
       case "contextMenuItems":
         mViewManager.setContextMenuItems(view, (ReadableArray) value);
         break;
+      case "selectionMenuConfig":
+        mViewManager.setSelectionMenuConfig(view, (ReadableMap) value);
+        break;
+      case "formatMenuConfig":
+        mViewManager.setFormatMenuConfig(view, (ReadableMap) value);
+        break;
       case "linkRegex":
         mViewManager.setLinkRegex(view, (ReadableMap) value);
         break;
@@ -148,6 +157,9 @@ public class EnrichedMarkdownTextInputManagerDelegate<T extends View, U extends
       case "removeMath":
         mViewManager.removeMath(view, args.getInt(0));
         break;
+      case "copyToClipboard":
+        mViewManager.copyToClipboard(view);
+        break;
       case "requestMarkdown":
         mViewManager.requestMarkdown(view, args.getInt(0));
         break;

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

@@ -22,6 +22,7 @@ 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 setMultiline(T view, boolean value);
   void setCursorColor(T view, @Nullable Integer value);
@@ -34,6 +35,8 @@ public interface EnrichedMarkdownTextInputManagerInterface<T extends View> exten
   void setFontWeight(T view, @Nullable String value);
   void setIsOnChangeMarkdownSet(T view, boolean value);
   void setContextMenuItems(T view, @Nullable ReadableArray value);
+  void setSelectionMenuConfig(T view, @Nullable ReadableMap value);
+  void setFormatMenuConfig(T view, @Nullable ReadableMap value);
   void setLinkRegex(T view, @Nullable ReadableMap value);
   void setMentionIndicators(T view, @Nullable ReadableArray value);
   void setWritingDirection(T view, @Nullable String value);
@@ -54,6 +57,7 @@ public interface EnrichedMarkdownTextInputManagerInterface<T extends View> exten
   void insertMath(T view, String latex, boolean displayMode);
   void updateMath(T view, int start, String latex, boolean displayMode);
   void removeMath(T view, int start);
+  void copyToClipboard(T view);
   void requestMarkdown(T view, int requestId);
   void requestCaretRect(T view, int requestId);
 }

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

@@ -71,6 +71,9 @@ public class EnrichedMarkdownTextManagerDelegate<T extends View, U extends BaseV
       case "selectionMenuConfig":
         mViewManager.setSelectionMenuConfig(view, (ReadableMap) value);
         break;
+      case "accessibilityLabels":
+        mViewManager.setAccessibilityLabels(view, (ReadableMap) value);
+        break;
       case "textBreakStrategy":
         mViewManager.setTextBreakStrategy(view, value == null ? "highQuality" : (String) value);
         break;

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

@@ -31,6 +31,7 @@ public interface EnrichedMarkdownTextManagerInterface<T extends View> extends Vi
   void setSpoilerOverlay(T view, @Nullable String value);
   void setContextMenuItems(T view, @Nullable ReadableArray value);
   void setSelectionMenuConfig(T view, @Nullable ReadableMap value);
+  void setAccessibilityLabels(T view, @Nullable ReadableMap value);
   void setTextBreakStrategy(T view, @Nullable String value);
   void setLineBreakStrategyIOS(T view, @Nullable String value);
   void setWritingDirection(T view, @Nullable String value);

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

@@ -34,6 +34,7 @@ EnrichedMarkdownProps::EnrichedMarkdownProps(
     spoilerOverlay(convertRawProp(context, rawProps, "spoilerOverlay", sourceProps.spoilerOverlay, {std::string{"particles"}})),
     contextMenuItems(convertRawProp(context, rawProps, "contextMenuItems", sourceProps.contextMenuItems, {})),
     selectionMenuConfig(convertRawProp(context, rawProps, "selectionMenuConfig", sourceProps.selectionMenuConfig, {})),
+    accessibilityLabels(convertRawProp(context, rawProps, "accessibilityLabels", sourceProps.accessibilityLabels, {})),
     textBreakStrategy(convertRawProp(context, rawProps, "textBreakStrategy", sourceProps.textBreakStrategy, {std::string{"highQuality"}})),
     lineBreakStrategyIOS(convertRawProp(context, rawProps, "lineBreakStrategyIOS", sourceProps.lineBreakStrategyIOS, {std::string{"none"}})),
     writingDirection(convertRawProp(context, rawProps, "writingDirection", sourceProps.writingDirection, {std::string{"first-strong"}})) {}
@@ -114,6 +115,10 @@ folly::dynamic EnrichedMarkdownProps::getDiffProps(
     result["selectionMenuConfig"] = toDynamic(selectionMenuConfig);
   }
     
+  if (accessibilityLabels != oldProps->accessibilityLabels) {
+    result["accessibilityLabels"] = toDynamic(accessibilityLabels);
+  }
+    
   if (textBreakStrategy != oldProps->textBreakStrategy) {
     result["textBreakStrategy"] = textBreakStrategy;
   }
@@ -139,6 +144,7 @@ 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, {})),
     multiline(convertRawProp(context, rawProps, "multiline", sourceProps.multiline, {false})),
     cursorColor(convertRawProp(context, rawProps, "cursorColor", sourceProps.cursorColor, {})),
@@ -151,6 +157,8 @@ EnrichedMarkdownTextInputProps::EnrichedMarkdownTextInputProps(
     fontWeight(convertRawProp(context, rawProps, "fontWeight", sourceProps.fontWeight, {})),
     isOnChangeMarkdownSet(convertRawProp(context, rawProps, "isOnChangeMarkdownSet", sourceProps.isOnChangeMarkdownSet, {false})),
     contextMenuItems(convertRawProp(context, rawProps, "contextMenuItems", sourceProps.contextMenuItems, {})),
+    selectionMenuConfig(convertRawProp(context, rawProps, "selectionMenuConfig", sourceProps.selectionMenuConfig, {})),
+    formatMenuConfig(convertRawProp(context, rawProps, "formatMenuConfig", sourceProps.formatMenuConfig, {})),
     linkRegex(convertRawProp(context, rawProps, "linkRegex", sourceProps.linkRegex, {})),
     mentionIndicators(convertRawProp(context, rawProps, "mentionIndicators", sourceProps.mentionIndicators, {})),
     writingDirection(convertRawProp(context, rawProps, "writingDirection", sourceProps.writingDirection, {std::string{"first-strong"}})) {}
@@ -195,6 +203,10 @@ folly::dynamic EnrichedMarkdownTextInputProps::getDiffProps(
     result["scrollEnabled"] = scrollEnabled;
   }
     
+  if (blockSyntax != oldProps->blockSyntax) {
+    result["blockSyntax"] = blockSyntax;
+  }
+    
   if (autoCapitalize != oldProps->autoCapitalize) {
     result["autoCapitalize"] = autoCapitalize;
   }
@@ -243,6 +255,14 @@ folly::dynamic EnrichedMarkdownTextInputProps::getDiffProps(
     result["contextMenuItems"] = toDynamic(contextMenuItems);
   }
     
+  if (selectionMenuConfig != oldProps->selectionMenuConfig) {
+    result["selectionMenuConfig"] = toDynamic(selectionMenuConfig);
+  }
+    
+  if (formatMenuConfig != oldProps->formatMenuConfig) {
+    result["formatMenuConfig"] = toDynamic(formatMenuConfig);
+  }
+    
   if (linkRegex != oldProps->linkRegex) {
     result["linkRegex"] = toDynamic(linkRegex);
   }
@@ -277,6 +297,7 @@ EnrichedMarkdownTextProps::EnrichedMarkdownTextProps(
     spoilerOverlay(convertRawProp(context, rawProps, "spoilerOverlay", sourceProps.spoilerOverlay, {std::string{"particles"}})),
     contextMenuItems(convertRawProp(context, rawProps, "contextMenuItems", sourceProps.contextMenuItems, {})),
     selectionMenuConfig(convertRawProp(context, rawProps, "selectionMenuConfig", sourceProps.selectionMenuConfig, {})),
+    accessibilityLabels(convertRawProp(context, rawProps, "accessibilityLabels", sourceProps.accessibilityLabels, {})),
     textBreakStrategy(convertRawProp(context, rawProps, "textBreakStrategy", sourceProps.textBreakStrategy, {std::string{"highQuality"}})),
     lineBreakStrategyIOS(convertRawProp(context, rawProps, "lineBreakStrategyIOS", sourceProps.lineBreakStrategyIOS, {std::string{"none"}})),
     writingDirection(convertRawProp(context, rawProps, "writingDirection", sourceProps.writingDirection, {std::string{"first-strong"}})) {}
@@ -357,6 +378,10 @@ folly::dynamic EnrichedMarkdownTextProps::getDiffProps(
     result["selectionMenuConfig"] = toDynamic(selectionMenuConfig);
   }
     
+  if (accessibilityLabels != oldProps->accessibilityLabels) {
+    result["accessibilityLabels"] = toDynamic(accessibilityLabels);
+  }
+    
   if (textBreakStrategy != oldProps->textBreakStrategy) {
     result["textBreakStrategy"] = textBreakStrategy;
   }