@expensify/react-native-live-markdown 0.1.128 → 0.1.129

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

@@ -13,7 +13,6 @@ import android.text.TextPaint;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.facebook.common.logging.FLog;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.common.mapbuffer.MapBuffer;
@@ -21,7 +20,7 @@ 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.TextLayoutManagerMapBuffer;
+import com.facebook.react.views.text.TextLayoutManager;
 import com.facebook.react.views.text.internal.span.TextInlineViewPlaceholderSpan;
 import com.facebook.yoga.YogaMeasureMode;
 import com.facebook.yoga.YogaMeasureOutput;
@@ -63,7 +62,7 @@ public class CustomMountingManager extends MountingManager {
       @Nullable float[] attachmentsPositions) {
 
     Spannable text =
-      TextLayoutManagerMapBuffer.getOrCreateSpannableForText(context, attributedString, null);
+      TextLayoutManager.getOrCreateSpannableForText(context, attributedString, null);
 
     if (text == null) {
       return 0;
@@ -71,14 +70,14 @@ public class CustomMountingManager extends MountingManager {
 
     int textBreakStrategy =
       TextAttributeProps.getTextBreakStrategy(
-        paragraphAttributes.getString(TextLayoutManagerMapBuffer.PA_KEY_TEXT_BREAK_STRATEGY));
+        paragraphAttributes.getString(TextLayoutManager.PA_KEY_TEXT_BREAK_STRATEGY));
     boolean includeFontPadding =
-      paragraphAttributes.contains(TextLayoutManagerMapBuffer.PA_KEY_INCLUDE_FONT_PADDING)
-        ? paragraphAttributes.getBoolean(TextLayoutManagerMapBuffer.PA_KEY_INCLUDE_FONT_PADDING)
+      paragraphAttributes.contains(TextLayoutManager.PA_KEY_INCLUDE_FONT_PADDING)
+        ? paragraphAttributes.getBoolean(TextLayoutManager.PA_KEY_INCLUDE_FONT_PADDING)
         : DEFAULT_INCLUDE_FONT_PADDING;
     int hyphenationFrequency =
       TextAttributeProps.getHyphenationFrequency(
-        paragraphAttributes.getString(TextLayoutManagerMapBuffer.PA_KEY_HYPHENATION_FREQUENCY));
+        paragraphAttributes.getString(TextLayoutManager.PA_KEY_HYPHENATION_FREQUENCY));
 
     // StaticLayout returns wrong metrics for the last line if it's empty, add something to the
     // last line so it's measured correctly
@@ -89,13 +88,15 @@ public class CustomMountingManager extends MountingManager {
       text = sb;
     }
 
+    Layout.Alignment alignment = TextLayoutManager.getTextAlignment(attributedString, text);
+
     markdownUtils.applyMarkdownFormatting((SpannableStringBuilder)text);
 
     BoringLayout.Metrics boring = BoringLayout.isBoring(text, sTextPaintInstance);
 
-    Class<TextLayoutManagerMapBuffer> mapBufferClass = TextLayoutManagerMapBuffer.class;
+    Class<TextLayoutManager> mapBufferClass = TextLayoutManager.class;
     try {
-      Method createLayoutMethod = mapBufferClass.getDeclaredMethod("createLayout", Spannable.class, BoringLayout.Metrics.class, float.class, YogaMeasureMode.class, boolean.class, int.class, int.class);
+      Method createLayoutMethod = mapBufferClass.getDeclaredMethod("createLayout", Spannable.class, BoringLayout.Metrics.class, float.class, YogaMeasureMode.class, boolean.class, int.class, int.class, Layout.Alignment.class);
       createLayoutMethod.setAccessible(true);
 
       Layout layout = (Layout)createLayoutMethod.invoke(
@@ -106,11 +107,12 @@ public class CustomMountingManager extends MountingManager {
         widthYogaMeasureMode,
         includeFontPadding,
         textBreakStrategy,
-        hyphenationFrequency);
+        hyphenationFrequency,
+        alignment);
 
       int maximumNumberOfLines =
-        paragraphAttributes.contains(TextLayoutManagerMapBuffer.PA_KEY_MAX_NUMBER_OF_LINES)
-          ? paragraphAttributes.getInt(TextLayoutManagerMapBuffer.PA_KEY_MAX_NUMBER_OF_LINES)
+        paragraphAttributes.contains(TextLayoutManager.PA_KEY_MAX_NUMBER_OF_LINES)
+          ? paragraphAttributes.getInt(TextLayoutManager.PA_KEY_MAX_NUMBER_OF_LINES)
           : UNSET;
 
       int calculatedLineCount =

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

@@ -65,6 +65,12 @@ target_link_libraries(
   yoga
   android
   log
+  mapbufferjni
+  reactnativejni
+  react_render_consistency
+  react_performance_timeline
+  react_render_observers_events
+  react_featureflags
 )
 
 target_compile_options(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expensify/react-native-live-markdown",
-  "version": "0.1.128",
+  "version": "0.1.129",
   "description": "Drop-in replacement for React Native's TextInput component with Markdown formatting.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -65,7 +65,7 @@
     "@commitlint/config-conventional": "^17.0.2",
     "@evilmartians/lefthook": "^1.5.0",
     "@lwc/eslint-plugin-lwc": "^1.7.2",
-    "@react-native/eslint-config": "^0.73.2",
+    "@react-native/eslint-config": "0.75.2",
     "@release-it/conventional-changelog": "^5.0.0",
     "@types/jest": "^28.1.2",
     "@types/react": "~17.0.21",
@@ -90,8 +90,8 @@
     "jest-environment-jsdom": "^29.7.0",
     "nodemon": "^3.1.3",
     "prettier": "2.8.8",
-    "react": "18.2.0",
-    "react-native": "0.74.5",
+    "react": "18.3.1",
+    "react-native": "0.75.2",
     "react-native-builder-bob": "^0.20.0",
     "react-native-web": "^0.19.10",
     "release-it": "^15.0.0",
@@ -100,8 +100,7 @@
   },
   "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",
-    "react-native@0.74.5": "patch:react-native@npm%3A0.74.5#./.yarn/patches/react-native-npm-0.74.5-3cfd406787.patch"
+    "link@^2.1.1": "patch:link@npm%3A2.1.1#./.yarn/patches/link-npm-2.1.1-1c9fea076e.patch"
   },
   "peerDependencies": {
     "react": "*",