@expensify/react-native-live-markdown 0.1.121 → 0.1.123

package/README.md

@@ -132,7 +132,7 @@ Currently, `react-native-live-markdown` supports only [ExpensiMark](https://gith
 
 ## Compatibility
 
-`react-native-live-markdown` requires React Native 0.71 or newer.
+`react-native-live-markdown` requires React Native 0.74 or newer.
 
 ## License
 

package/android/src/main/java/com/expensify/livemarkdown/CustomMountingManager.java

@@ -21,8 +21,8 @@ import com.facebook.react.fabric.mounting.MountingManager;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ViewManagerRegistry;
 import com.facebook.react.views.text.TextAttributeProps;
-import com.facebook.react.views.text.TextInlineViewPlaceholderSpan;
 import com.facebook.react.views.text.TextLayoutManagerMapBuffer;
+import com.facebook.react.views.text.internal.span.TextInlineViewPlaceholderSpan;
 import com.facebook.yoga.YogaMeasureMode;
 import com.facebook.yoga.YogaMeasureOutput;
 
@@ -44,7 +44,7 @@ public class CustomMountingManager extends MountingManager {
 
     AssetManager assetManager = context.getAssets();
     MarkdownUtils.maybeInitializeRuntime(assetManager);
-    
+
     this.markdownUtils = new MarkdownUtils(assetManager);
     this.markdownUtils.setMarkdownStyle(new MarkdownStyle(decoratorProps, context));
   }

package/android/src/main/java/com/expensify/livemarkdown/LiveMarkdownModule.java

@@ -1,7 +1,6 @@
 package com.expensify.livemarkdown;
 
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.UIManager;
 import com.facebook.react.fabric.FabricUIManager;
 import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.common.UIManagerType;

package/android/src/main/java/com/expensify/livemarkdown/MarkdownUtils.java

@@ -1,17 +1,12 @@
 package com.expensify.livemarkdown;
 
-import static com.facebook.infer.annotation.ThreadConfined.UI;
-
 import android.content.res.AssetManager;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 
 import androidx.annotation.NonNull;
 
-import com.facebook.infer.annotation.Assertions;
-import com.facebook.infer.annotation.ThreadConfined;
-import com.facebook.react.bridge.UiThreadUtil;
-import com.facebook.react.views.text.CustomLineHeightSpan;
+import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
 import com.facebook.soloader.SoLoader;
 
 import org.json.JSONArray;

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

@@ -19,7 +19,7 @@ set(RN_DIR ${LIB_ANDROID_DIR}/../example/node_modules/react-native)
 
 add_library(
   ${LIB_TARGET_NAME}
-  SHARED 
+  SHARED
   ${LIB_MODULE_SRCS}
   ${LIB_CUSTOM_SRCS}
   ${LIB_CODEGEN_SRCS}
@@ -42,6 +42,8 @@ target_link_libraries(
   ReactAndroid::rrc_textinput
   ReactAndroid::react_render_textlayoutmanager
   ReactAndroid::react_render_imagemanager
+  ReactAndroid::reactnativejni
+  ReactAndroid::mapbufferjni
   fabricjni
   fbjni
   folly_runtime
@@ -79,4 +81,4 @@ target_include_directories(
  ${CMAKE_PROJECT_NAME}
  PUBLIC
  ${CMAKE_CURRENT_SOURCE_DIR}
-)
+)

package/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.cpp

@@ -11,7 +11,7 @@ namespace react {
 extern const char MarkdownTextInputDecoratorViewComponentName[] =
     "MarkdownTextInputDecoratorView";
 
-const ShadowNodeFragment::Value
+const OwningShadowNodeFragment
 MarkdownTextInputDecoratorShadowNode::updateFragmentState(
     ShadowNodeFragment const &fragment,
     ShadowNodeFamily::Shared const &family) {
@@ -24,12 +24,12 @@ MarkdownTextInputDecoratorShadowNode::updateFragmentState(
   // propagated on every clone we need it to clear the reference in the registry
   // when the view is removed from window it cannot be done in the destructor,
   // as multiple shadow nodes for the same family may be created
-  return ShadowNodeFragment::Value({
+  return OwningShadowNodeFragment{
       .props = fragment.props,
       .children = fragment.children,
       .state =
           std::make_shared<const ConcreteState>(newStateData, *fragment.state),
-  });
+  };
 }
 
 } // namespace react

package/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.h

@@ -11,6 +11,20 @@
 namespace facebook {
 namespace react {
 
+struct OwningShadowNodeFragment {
+  Props::Shared props;
+  ShadowNode::SharedListOfShared children;
+  State::Shared state;
+  
+  operator ShadowNodeFragment() const {
+    return ShadowNodeFragment {
+      .props = props,
+      .children = children,
+      .state = state
+    };
+  }
+};
+
 JSI_EXPORT extern const char MarkdownTextInputDecoratorViewComponentName[];
 
 class JSI_EXPORT MarkdownTextInputDecoratorShadowNode final
@@ -22,8 +36,7 @@ public:
   MarkdownTextInputDecoratorShadowNode(ShadowNodeFragment const &fragment,
                                        ShadowNodeFamily::Shared const &family,
                                        ShadowNodeTraits traits)
-      : ConcreteViewShadowNode(static_cast<ShadowNodeFragment>(
-                                   updateFragmentState(fragment, family)),
+      : ConcreteViewShadowNode(updateFragmentState(fragment, family),
                                family, traits) {}
 
   MarkdownTextInputDecoratorShadowNode(ShadowNode const &sourceShadowNode,
@@ -37,7 +50,7 @@ public:
   }
 
 private:
-  static const ShadowNodeFragment::Value
+  static const OwningShadowNodeFragment
   updateFragmentState(ShadowNodeFragment const &fragment,
                       ShadowNodeFamily::Shared const &family);
 };

package/lib/commonjs/MarkdownTextInput.web.js

@@ -529,7 +529,7 @@ const styles = _reactNative.StyleSheet.create({
   },
   disabledInputStyles: {
     opacity: 0.75,
-    cursor: 'default'
+    cursor: 'auto'
   }
 });
 var _default = exports.default = MarkdownTextInput;

package/lib/module/MarkdownTextInput.web.js

@@ -520,7 +520,7 @@ const styles = StyleSheet.create({
   },
   disabledInputStyles: {
     opacity: 0.75,
-    cursor: 'default'
+    cursor: 'auto'
   }
 });
 export default MarkdownTextInput;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expensify/react-native-live-markdown",
-  "version": "0.1.121",
+  "version": "0.1.123",
   "description": "Drop-in replacement for React Native's TextInput component with Markdown formatting.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -91,7 +91,7 @@
     "nodemon": "^3.1.3",
     "prettier": "2.8.8",
     "react": "18.2.0",
-    "react-native": "0.73.4",
+    "react-native": "0.74.5",
     "react-native-builder-bob": "^0.20.0",
     "react-native-web": "^0.19.10",
     "release-it": "^15.0.0",
@@ -100,7 +100,8 @@
   },
   "resolutions": {
     "@types/react": "17.0.21",
-    "link@^2.1.1": "patch:link@npm%3A2.1.1#./.yarn/patches/link-npm-2.1.1-1c9fea076e.patch"
+    "link@^2.1.1": "patch:link@npm%3A2.1.1#./.yarn/patches/link-npm-2.1.1-1c9fea076e.patch",
+    "react-native@0.74.5": "patch:react-native@npm%3A0.74.5#./.yarn/patches/react-native-npm-0.74.5-3cfd406787.patch"
   },
   "peerDependencies": {
     "react": "*",
@@ -111,7 +112,7 @@
     "example",
     "WebExample"
   ],
-  "packageManager": "yarn@3.6.1",
+  "packageManager": "yarn@3.6.4",
   "engines": {
     "node": ">= 18.0.0"
   },

package/src/MarkdownTextInput.web.tsx

@@ -687,7 +687,7 @@ const styles = StyleSheet.create({
   },
   disabledInputStyles: {
     opacity: 0.75,
-    cursor: 'default',
+    cursor: 'auto',
   },
 });