Merge branch 'main' into @jpiasecki/display-contents

Author: j-piasecki

.github/workflows/build-android.yml

@@ -26,12 +26,8 @@ jobs:
   build:
     if: github.repository == 'Expensify/react-native-live-markdown'
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        react-native-architecture: ['Paper', 'Fabric']
-      fail-fast: false
     concurrency:
-      group: build-android-${{ matrix.react-native-architecture }}-${{ github.ref }}
+      group: build-android-${{ github.ref }}
       cancel-in-progress: true
     steps:
       - name: Check out Git repository
@@ -48,4 +44,4 @@ jobs:
 
       - name: Build app
         working-directory: example/android
-        run: ./gradlew assembleDebug --build-cache -PreactNativeArchitectures=arm64-v8a -PnewArchEnabled=${{ matrix.react-native-architecture == 'Fabric' && 'true' || 'false' }}
+        run: ./gradlew assembleDebug --build-cache -PreactNativeArchitectures=arm64-v8a

.github/workflows/build-ios.yml

@@ -26,12 +26,8 @@ jobs:
   build:
     if: github.repository == 'Expensify/react-native-live-markdown'
     runs-on: macos-13
-    strategy:
-      matrix:
-        react-native-architecture: ['Paper', 'Fabric']
-      fail-fast: false
     concurrency:
-      group: build-ios-${{ matrix.react-native-architecture }}-${{ github.ref }}
+      group: build-ios-${{ github.ref }}
       cancel-in-progress: true
     steps:
       - name: Check out Git repository
@@ -43,8 +39,8 @@ jobs:
           path: |
             node_modules
             example/node_modules
-          key: build-ios-node-modules-${{ matrix.react-native-architecture }}-${{ hashFiles('package-lock.json') }}
-          restore-keys: build-ios-node-modules-${{ matrix.react-native-architecture }}-
+          key: build-ios-node-modules-${{ hashFiles('package-lock.json') }}
+          restore-keys: build-ios-node-modules-
 
       - name: Install node_modules
         run: npm ci
@@ -56,13 +52,11 @@ jobs:
             example/ios/Pods
             ~/Library/Caches/CocoaPods
             ~/.cocoapods
-          key: build-ios-pods-${{ matrix.react-native-architecture }}-${{ hashFiles('node_modules/react-native/package.json') }}
-          restore-keys: build-ios-pods-${{ matrix.react-native-architecture }}-
+          key: build-ios-pods-${{ hashFiles('node_modules/react-native/package.json') }}
+          restore-keys: build-ios-pods-
 
       - name: Install Pods
         working-directory: example/ios
-        env:
-          RCT_NEW_ARCH_ENABLED: ${{ matrix.react-native-architecture == 'Fabric' && '1' || '0' }}
         run: |
           bundler install
           bundler exec pod install
@@ -75,8 +69,8 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/Library/Developer/Xcode/DerivedData
-          key: build-ios-derived-data-${{ matrix.react-native-architecture }}-${{ hashFiles('node_modules/react-native/package.json') }}
-          restore-keys: build-ios-derived-data-${{ matrix.react-native-architecture }}-
+          key: build-ios-derived-data-${{ hashFiles('node_modules/react-native/package.json') }}
+          restore-keys: build-ios-derived-data-
 
       - name: Build app
         working-directory: example

CONTRIBUTING.md

@@ -56,7 +56,7 @@ By default, the example is configured to build with the old architecture. To run
 2. For iOS, run:
 
    ```sh
-   cd example/ios && bundler install && RCT_NEW_ARCH_ENABLED=1 bundler exec pod install
+   cd example/ios && bundler install && bundler exec pod install
    npm run example ios
    ```
 

README.md

@@ -8,7 +8,7 @@
 - 🔧 Customizable logic
 - 🎨 Customizable styles
 - 🌐 Universal support (Android, iOS, web)
-- 🏗️ Supports New Architecture
+- 🏗️ Supports only the New Architecture
 
 ## Installation
 
@@ -179,7 +179,7 @@ Currently, `react-native-live-markdown` supports only [ExpensiMark](https://gith
 
 ## Compatibility
 
-`react-native-live-markdown` supports two latest React Native minor releases.
+`react-native-live-markdown` supports two latest React Native minor releases with the New Architecture enabled.
 
 | react-native | @expensify/react-native-live-markdown |
 | :----------: | :-----------------------------------: |

RNLiveMarkdown.podspec

@@ -36,19 +36,17 @@ Pod::Spec.new do |s|
 
   install_modules_dependencies(s)
 
-  if ENV['USE_FRAMEWORKS'] != nil && ENV['RCT_NEW_ARCH_ENABLED'] == '1'
+  if ENV['USE_FRAMEWORKS'] != nil
     add_dependency(s, "React-FabricComponents", :additional_framework_paths => [
       "react/renderer/textlayoutmanager/platform/ios",
       "react/renderer/components/textinput/platform/ios",
     ])
     add_dependency(s, "React-rendererconsistency")
   end
 
-  if ENV['RCT_NEW_ARCH_ENABLED'] == '1'
-    s.subspec "newarch" do |ss|
-      ss.source_files         = "cpp/**/*.{cpp,h}"
-      ss.header_dir           = "RNLiveMarkdown"
-      ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/cpp\"" }
-    end
+  s.subspec "newarch" do |ss|
+    ss.source_files         = "cpp/**/*.{cpp,h}"
+    ss.header_dir           = "RNLiveMarkdown"
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/cpp\"" }
   end
 end

android/build.gradle

@@ -18,15 +18,8 @@ def reactNativeArchitectures() {
   return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
 }
 
-def isNewArchitectureEnabled() {
-  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
-}
-
 apply plugin: "com.android.library"
-
-if (isNewArchitectureEnabled()) {
-  apply plugin: "com.facebook.react"
-}
+apply plugin: "com.facebook.react"
 
 def getExtOrDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["LiveMarkdown_" + name]
@@ -128,15 +121,10 @@ android {
 
   sourceSets {
     main {
-      if (isNewArchitectureEnabled()) {
-        java.srcDirs += [
-          "src/newarch",
-          // This is needed to build Kotlin project with NewArch enabled
-          "${project.buildDir}/generated/source/codegen/java"
-        ]
-      } else {
-        java.srcDirs += ["src/oldarch"]
-      }
+      java.srcDirs += [
+        // This is needed to build Kotlin project with NewArch enabled
+        "${project.buildDir}/generated/source/codegen/java"
+      ]
 
       // TextLayoutManager
       if (REACT_NATIVE_MINOR_VERSION <= 76 ) {
@@ -189,14 +177,6 @@ dependencies {
   implementation project(":react-native-reanimated")
 }
 
-if (isNewArchitectureEnabled()) {
-  react {
-    jsRootDir = file("../src/")
-    libraryName = "LiveMarkdown"
-    codegenJavaPackageName = "com.expensify.livemarkdown"
-  }
-}
-
 // This fixes linking errors due to undefined symbols from libworklets.so.
 // During Gradle Sync, Android Gradle Plugin runs Prefab and treats worklets
 // like a header-only library. During build, config files are not regenerated

android/src/newarch/LiveMarkdownModuleSpec.java android/src/main/java/com/expensify/livemarkdown/LiveMarkdownModuleSpec.java

@@ -3,7 +3,6 @@
 import static com.facebook.react.views.text.TextAttributeProps.UNSET;
 
 import android.content.Context;
-import android.content.res.AssetManager;
 import android.text.BoringLayout;
 import android.text.Layout;
 import android.text.Spannable;

android/src/newarch/MarkdownTextInputDecoratorViewManagerSpec.java android/src/main/java/com/expensify/livemarkdown/MarkdownTextInputDecoratorViewManagerSpec.java

@@ -1,16 +1,8 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <RNLiveMarkdownSpec/RNLiveMarkdownSpec.h>
-#else
-#import <React/RCTBridgeModule.h>
-#endif // RCT_NEW_ARCH_ENABLED
 
 #import <React/RCTEventEmitter.h>
 
 // Without inheriting after RCTEventEmitter we don't get access to bridge
-@interface LiveMarkdownModule : RCTEventEmitter
-#ifdef RCT_NEW_ARCH_ENABLED
-                                <NativeLiveMarkdownModuleSpec>
-#else
-                                <RCTBridgeModule>
-#endif // RCT_NEW_ARCH_ENABLED
+@interface LiveMarkdownModule : RCTEventEmitter <NativeLiveMarkdownModuleSpec>
+
 @end

android/src/oldarch/LiveMarkdownModuleSpec.java

@@ -3,11 +3,8 @@
 #import <RNLiveMarkdown/RuntimeDecorator.h>
 
 #import <React/RCTBridge+Private.h>
-
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTScheduler.h>
 #import <React/RCTSurfacePresenter.h>
-#endif // RCT_NEW_ARCH_ENABLED
 
 #import <jsi/jsi.h>
 
@@ -18,11 +15,7 @@
 // I think this is the easiest way to access the UIManager, which we need to
 // actually register the hook
 
-@implementation LiveMarkdownModule {
-#ifdef RCT_NEW_ARCH_ENABLED
-  __weak RCTSurfacePresenter *surfacePresenter_;
-#endif // RCT_NEW_ARCH_ENABLED
-}
+@implementation LiveMarkdownModule
 
 RCT_EXPORT_MODULE()
 
@@ -35,38 +28,6 @@ @implementation LiveMarkdownModule {
   return @(1);
 }
 
-#ifdef RCT_NEW_ARCH_ENABLED
-
-- (void)handleJavaScriptDidLoadNotification:(NSNotification *)notification
-{
-  surfacePresenter_ = self.bridge.surfacePresenter;
-}
-
-- (void)setBridge:(RCTBridge *)bridge
-{
-  [super setBridge:bridge];
-
-  [[NSNotificationCenter defaultCenter] addObserver:self
-                                           selector:@selector(handleJavaScriptDidLoadNotification:)
-                                               name:RCTJavaScriptDidLoadNotification
-                                             object:nil];
-
-  // only within the first loading `self.bridge.surfacePresenter` exists
-  // during the reload `self.bridge.surfacePresenter` is null
-  if (self.bridge.surfacePresenter) {
-    surfacePresenter_ = self.bridge.surfacePresenter;
-  }
-}
-
-/*
- * Taken from RCTNativeAnimatedTurboModule:
- * This selector is invoked via BridgelessTurboModuleSetup.
- */
-- (void)setSurfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter
-{
-  surfacePresenter_ = surfacePresenter;
-}
-
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params {
   return std::make_shared<facebook::react::NativeLiveMarkdownModuleSpecJSI>(
@@ -78,6 +39,4 @@ - (void)invalidate {
   [super invalidate];
 }
 
-#endif // RCT_NEW_ARCH_ENABLED
-
 @end

android/src/oldarch/MarkdownTextInputDecoratorViewManagerSpec.java

@@ -1,5 +1,3 @@
-// This guard prevent this file to be compiled in the old architecture.
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTViewComponentView.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -8,5 +6,3 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif /* RCT_NEW_ARCH_ENABLED */

android/src/oldarch/NativeLiveMarkdownModuleSpec.java

@@ -1,5 +1,3 @@
-// This guard prevent this file to be compiled in the old architecture.
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <react/renderer/components/RNLiveMarkdownSpec/Props.h>
 
 #import <RNLiveMarkdown/MarkdownTextInputDecoratorComponentView.h>
@@ -26,11 +24,7 @@ @implementation MarkdownTextInputDecoratorComponentView {
     RCTMarkdownUtils *_markdownUtils;
     RCTMarkdownStyle *_markdownStyle;
     NSNumber *_parserId;
-  #ifdef RCT_NEW_ARCH_ENABLED
     __weak RCTTextInputComponentView *_textInput;
-  #else
-    __weak RCTBaseTextInputView *_textInput;
-  #endif /* RCT_NEW_ARCH_ENABLED */
     __weak UIView<RCTBackedTextInputViewProtocol> *_backedTextInputView;
     __weak RCTBackedTextFieldDelegateAdapter *_adapter;
     __weak RCTUITextView *_textView;
@@ -143,4 +137,3 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
 }
 
 @end
-#endif