Merge branch 'main' into @tomekzaw/ios-blockquote-line-height

RNLiveMarkdown.podspec

@@ -4,6 +4,10 @@ react_native_node_modules_dir = ENV['REACT_NATIVE_NODE_MODULES_DIR'] || File.joi
 react_native_json = JSON.parse(File.read(File.join(react_native_node_modules_dir, 'react-native/package.json')))
 react_native_minor_version = react_native_json['version'].split('.')[1].to_i
 
+pods_root = Pod::Config.instance.project_pods_root
+react_native_reanimated_node_modules_dir = ENV['REACT_NATIVE_REANIMATED_NODE_MODULES_DIR'] || File.dirname(`cd "#{Pod::Config.instance.installation_root.to_s}" && node --print "require.resolve('react-native-reanimated/package.json')"`)
+react_native_reanimated_node_modules_dir_from_pods_root = Pathname.new(react_native_reanimated_node_modules_dir).relative_path_from(pods_root).to_s
+
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 
@@ -23,7 +27,11 @@ Pod::Spec.new do |s|
   s.dependency "RNReanimated/worklets"
 
   s.xcconfig = {
-    "OTHER_CFLAGS" => "$(inherited) -DREACT_NATIVE_MINOR_VERSION=#{react_native_minor_version}"
+    "OTHER_CFLAGS" => "$(inherited) -DREACT_NATIVE_MINOR_VERSION=#{react_native_minor_version}",
+    "HEADER_SEARCH_PATHS" => [
+      "\"$(PODS_ROOT)/#{react_native_reanimated_node_modules_dir_from_pods_root}/apple\"",
+      "\"$(PODS_ROOT)/#{react_native_reanimated_node_modules_dir_from_pods_root}/Common/cpp\"",
+    ].join(' '),
   }
 
   install_modules_dependencies(s)
@@ -33,6 +41,7 @@ Pod::Spec.new do |s|
       "react/renderer/textlayoutmanager/platform/ios",
       "react/renderer/components/textinput/platform/ios",
     ])
+    add_dependency(s, "React-rendererconsistency")
   end
 
   if ENV['RCT_NEW_ARCH_ENABLED'] == '1'

android/src/main/java/com/expensify/livemarkdown/MarkdownTextInputDecoratorView.java

@@ -61,6 +61,7 @@ protected void onAttachedToWindow() {
       mReactEditText = (ReactEditText) previousSibling;
       mTextWatcher = new MarkdownTextWatcher(mMarkdownUtils);
       mReactEditText.addTextChangedListener(mTextWatcher);
+      applyNewStyles();
     }
   }
 

example/ios/Podfile.lock

@@ -1897,7 +1897,7 @@ SPEC CHECKSUMS:
   React-utils: f2afa6acd905ca2ce7bb8ffb4a22f7f8a12534e8
   ReactCodegen: e35c23cdd36922f6d2990c6c1f1b022ade7ad74d
   ReactCommon: 289214026502e6a93484f4a46bcc0efa4f3f2864
-  RNLiveMarkdown: e8b7f5cf8a0e8027850a781ffc86119e21fb406a
+  RNLiveMarkdown: 1ee098c3a830c3133c23fc163b0aff29398a293e
   RNReanimated: 75df06d3a81fc147b83056ae469512f573365b1d
   SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
   Yoga: 1354c027ab07c7736f99a3bef16172d6f1b12b47

package.json

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