@expensify/react-native-live-markdown 0.1.140 → 0.1.142

package/android/src/main/cpp/CMakeLists.txt

@@ -18,8 +18,18 @@ find_package(fbjni REQUIRED CONFIG)
 find_package(ReactAndroid REQUIRED CONFIG)
 find_package(hermes-engine REQUIRED CONFIG)
 
-target_link_libraries(${CMAKE_PROJECT_NAME}
-        fbjni::fbjni
-        ReactAndroid::jsi
-        ReactAndroid::reactnativejni
-        hermes-engine::libhermes)
+if (ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
+  target_link_libraries(${CMAKE_PROJECT_NAME}
+          fbjni::fbjni
+          ReactAndroid::jsi
+          ReactAndroid::reactnative
+          hermes-engine::libhermes)
+elseif (ReactAndroid_VERSION_MINOR GREATER_EQUAL 75)
+  target_link_libraries(${CMAKE_PROJECT_NAME}
+          fbjni::fbjni
+          ReactAndroid::jsi
+          ReactAndroid::reactnativejni
+          hermes-engine::libhermes)
+else ()
+  message(FATAL_ERROR "react-native-live-markdown requires react-native 0.75 or newer.")
+endif ()

package/android/src/main/new_arch/CMakeLists.txt

@@ -36,42 +36,53 @@ target_include_directories(
 
 find_package(ReactAndroid REQUIRED CONFIG)
 
-target_link_libraries(
-  ${LIB_TARGET_NAME}
-  ReactAndroid::rrc_text
-  ReactAndroid::rrc_textinput
-  ReactAndroid::react_render_textlayoutmanager
-  ReactAndroid::react_render_imagemanager
-  ReactAndroid::reactnativejni
-  ReactAndroid::mapbufferjni
-  fabricjni
-  fbjni
-  folly_runtime
-  glog
-  jsi
-  react_codegen_rncore
-  react_debug
-  react_nativemodule_core
-  react_render_core
-  react_render_debug
-  react_render_graphics
-  react_render_mapbuffer
-  ReactAndroid::react_render_uimanager
-  ReactAndroid::react_render_scheduler
-  react_utils
-  runtimeexecutor
-  rrc_view
-  turbomodulejsijni
-  yoga
-  android
-  log
-  mapbufferjni
-  reactnativejni
-  react_render_consistency
-  react_performance_timeline
-  react_render_observers_events
-  react_featureflags
-)
+if (ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
+  target_link_libraries(
+    ${LIB_TARGET_NAME}
+    ReactAndroid::reactnative
+    ReactAndroid::jsi
+    fbjni::fbjni
+  )
+elseif (ReactAndroid_VERSION_MINOR GREATER_EQUAL 75)
+  target_link_libraries(
+    ${LIB_TARGET_NAME}
+    ReactAndroid::rrc_text
+    ReactAndroid::rrc_textinput
+    ReactAndroid::react_render_textlayoutmanager
+    ReactAndroid::react_render_imagemanager
+    ReactAndroid::reactnativejni
+    ReactAndroid::mapbufferjni
+    fabricjni
+    fbjni
+    folly_runtime
+    glog
+    jsi
+    react_codegen_rncore
+    react_debug
+    react_nativemodule_core
+    react_render_core
+    react_render_debug
+    react_render_graphics
+    react_render_mapbuffer
+    ReactAndroid::react_render_uimanager
+    ReactAndroid::react_render_scheduler
+    react_utils
+    runtimeexecutor
+    rrc_view
+    turbomodulejsijni
+    yoga
+    android
+    log
+    mapbufferjni
+    reactnativejni
+    react_render_consistency
+    react_performance_timeline
+    react_render_observers_events
+    react_featureflags
+  )
+else ()
+  message(FATAL_ERROR "react-native-live-markdown requires react-native 0.75 or newer.")
+endif ()
 
 target_compile_options(
   ${LIB_TARGET_NAME}

package/ios/MarkdownCommitHook.mm

@@ -169,6 +169,53 @@ RootShadowNode::Unshared MarkdownCommitHook::shadowTreeWillCommit(
                 }
             }
 
+            // apply markdown
+            auto newString = [utils parseMarkdown:nsAttributedString
+                                   withAttributes:defaultNSTextAttributes];
+
+            // create a clone of the old TextInputState and update the
+            // attributed string box to point to the string with markdown
+            // applied
+            auto newStateData = std::make_shared<TextInputState>(stateData);
+            newStateData->attributedStringBox =
+                RCTAttributedStringBoxFromNSAttributedString(newString);
+
+            // clone the text input with the new state
+            return node.clone({
+                .state = std::make_shared<const ConcreteState<TextInputState>>(
+                    newStateData, textInputState),
+            });
+          });
+    } else if (stateData.attributedStringBox.getMode() ==
+            AttributedStringBox::Mode::OpaquePointer) {
+      rootNode = rootNode->cloneTree(
+          nodes.textInput->getFamily(),
+          [&nodes, &textInputState, &stateData,
+           fontSizeMultiplier](const ShadowNode &node) {
+            const auto &markdownProps = *std::static_pointer_cast<
+                MarkdownTextInputDecoratorViewProps const>(
+                nodes.decorator->getProps());
+            const auto &textInputProps =
+                *std::static_pointer_cast<TextInputProps const>(
+                    nodes.textInput->getProps());
+
+            const auto defaultTextAttributes =
+                textInputProps.getEffectiveTextAttributes(fontSizeMultiplier);
+            const auto defaultNSTextAttributes =
+                RCTNSTextAttributesFromTextAttributes(defaultTextAttributes);
+
+            // this can possibly be optimized
+            RCTMarkdownStyle *markdownStyle = [[RCTMarkdownStyle alloc]
+                initWithStruct:markdownProps.markdownStyle];
+            RCTMarkdownUtils *utils = [[RCTMarkdownUtils alloc] init];
+            [utils setMarkdownStyle:markdownStyle];
+
+            // convert the attibuted string stored in state to
+            // NSAttributedString
+            auto nsAttributedString =
+                RCTNSAttributedStringFromAttributedStringBox(
+                    stateData.attributedStringBox);
+
             // apply markdown
             auto newString = [utils parseMarkdown:nsAttributedString
                                    withAttributes:defaultNSTextAttributes];

package/package.json

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