Enable New Architecture in Bluesky on RN 0.76

app.config.js

@@ -203,13 +203,13 @@ module.exports = function (config) {
           {
             ios: {
               deploymentTarget: '15.1',
-              newArchEnabled: false,
+              newArchEnabled: true,
             },
             android: {
               compileSdkVersion: 35,
               targetSdkVersion: 35,
               buildToolsVersion: '35.0.0',
-              newArchEnabled: false,
+              newArchEnabled: true,
             },
           },
         ],
@@ -222,7 +222,6 @@ module.exports = function (config) {
           },
         ],
         'react-native-compressor',
-        '@bitdrift/react-native',
         './plugins/starterPackAppClipExtension/withStarterPackAppClip.js',
         './plugins/withAndroidManifestPlugin.js',
         './plugins/withAndroidManifestFCMIconPlugin.js',

modules/bottom-sheet/ios/BottomSheet-Bridging-Header.h

@@ -0,0 +1,4 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+#import <React/RCTSurfaceTouchHandler.h>

modules/bottom-sheet/ios/BottomSheet.podspec

@@ -11,10 +11,14 @@ Pod::Spec.new do |s|
 
   s.dependency 'ExpoModulesCore'
 
+  new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
+  new_arch_compiler_flags = '-DRCT_NEW_ARCH_ENABLED'
+
   # Swift/Objective-C compatibility
   s.pod_target_xcconfig = {
     'DEFINES_MODULE' => 'YES',
-    'SWIFT_COMPILATION_MODE' => 'wholemodule'
+    'SWIFT_COMPILATION_MODE' => 'wholemodule',
+    'OTHER_SWIFT_FLAGS' => "$(inherited) #{new_arch_enabled ? new_arch_compiler_flags : ''}",
   }
 
   s.source_files = "**/*.{h,m,swift}"

modules/bottom-sheet/ios/SheetView.swift

@@ -5,7 +5,11 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
   // Views
   private var sheetVc: SheetViewController?
   private var innerView: UIView?
+#if RCT_NEW_ARCH_ENABLED
+  private var touchHandler: RCTSurfaceTouchHandler?
+#else
   private var touchHandler: RCTTouchHandler?
+#endif
 
   // Events
   private let onAttemptDismiss = EventDispatcher()
@@ -73,7 +77,11 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
   required init (appContext: AppContext? = nil) {
     super.init(appContext: appContext)
     self.maxHeight = Util.getScreenHeight()
+#if RCT_NEW_ARCH_ENABLED
+    self.touchHandler = RCTSurfaceTouchHandler()
+#else
     self.touchHandler = RCTTouchHandler(bridge: appContext?.reactBridge)
+#endif
     SheetManager.shared.add(self)
   }
 
@@ -87,6 +95,15 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
     self.touchHandler?.attach(to: subview)
     self.innerView = subview
   }
+
+#if RCT_NEW_ARCH_ENABLED
+  override func mountChildComponentView(_ childComponentView: UIView, index: Int) {
+    self.touchHandler?.attach(to: childComponentView)
+    self.innerView = childComponentView
+  }
+
+  override func unmountChildComponentView(_ childComponentView: UIView, index: Int) {}
+#endif
 
   // We'll grab the content height from here so we know the initial detent to set
   override func layoutSubviews() {
@@ -107,7 +124,9 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
     self.isClosing = false
     self.isOpen = false
     self.sheetVc = nil
-    self.touchHandler?.detach(from: self.innerView)
+    if let innerView = self.innerView {
+      self.touchHandler?.detach(from: innerView)
+    }
     self.touchHandler = nil
     self.innerView = nil
     SheetManager.shared.remove(self)

modules/bottom-sheet/src/BottomSheetNativeComponent.tsx

@@ -110,6 +110,7 @@ export class BottomSheetNativeComponent extends React.Component<
           }}
           containerBackgroundColor={backgroundColor}>
           <View
+            collapsable={false}
             style={[
               {
                 flex: 1,
@@ -122,6 +123,7 @@ export class BottomSheetNativeComponent extends React.Component<
               extraStyles,
             ]}>
             <View
+              collapsable={false}
               onLayout={e => {
                 const {height} = e.nativeEvent.layout
                 this.setState({viewHeight: height})

modules/expo-bluesky-gif-view/android/build.gradle

@@ -94,5 +94,5 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
 
   // Keep glide version up to date with expo-image so that we don't have duplicate deps
-  implementation 'com.github.bumptech.glide:glide:4.13.2'
+  implementation 'com.github.bumptech.glide:glide:4.16.0'
 }

package.json

@@ -55,7 +55,7 @@
   },
   "dependencies": {
     "@atproto/api": "^0.13.20",
-    "@bitdrift/react-native": "0.4.0",
+    "@bitdrift/react-native": "0.5.0",
     "@braintree/sanitize-url": "^6.0.2",
     "@discord/bottom-sheet": "bluesky-social/react-native-bottom-sheet",
     "@emoji-mart/react": "^1.1.1",
@@ -74,21 +74,21 @@
     "@haileyok/bluesky-video": "0.2.4",
     "@ipld/dag-cbor": "^9.2.0",
     "@lingui/react": "^4.14.1",
-    "@mattermost/react-native-paste-input": "^0.7.1",
+    "@mattermost/react-native-paste-input": "bluesky-social/react-native-paste-input",
     "@miblanchard/react-native-slider": "^2.3.1",
     "@mozzius/expo-dynamic-app-icon": "^1.5.0",
     "@radix-ui/react-dismissable-layer": "^1.1.1",
     "@radix-ui/react-dropdown-menu": "2.0.1",
     "@radix-ui/react-focus-guards": "^1.1.1",
     "@radix-ui/react-focus-scope": "^1.1.0",
-    "@react-native-async-storage/async-storage": "1.23.1",
+    "@react-native-async-storage/async-storage": "1.24.0",
     "@react-native-menu/menu": "^1.1.7",
     "@react-native-picker/picker": "2.10.2",
-    "@react-navigation/bottom-tabs": "^6.5.20",
-    "@react-navigation/drawer": "^6.6.15",
-    "@react-navigation/native": "^6.1.17",
-    "@react-navigation/native-stack": "^6.9.26",
-    "@sentry/react-native": "5.24.3",
+    "@react-navigation/bottom-tabs": "^6.6.1",
+    "@react-navigation/drawer": "^6.7.2",
+    "@react-navigation/native": "^6.1.18",
+    "@react-navigation/native-stack": "^6.11.0",
+    "@sentry/react-native": "~6.1.0",
     "@tanstack/query-async-storage-persister": "^5.25.0",
     "@tanstack/react-query": "^5.8.1",
     "@tanstack/react-query-persist-client": "^5.25.0",
@@ -164,9 +164,9 @@
     "patch-package": "^6.5.1",
     "postinstall-postinstall": "^2.1.0",
     "psl": "^1.9.0",
-    "react": "18.2.0",
+    "react": "18.3.1",
     "react-compiler-runtime": "19.0.0-beta-a7bf2bd-20241110",
-    "react-dom": "^18.2.0",
+    "react-dom": "18.3.1",
     "react-image-crop": "^11.0.7",
     "react-keyed-flatten-children": "^3.0.0",
     "react-native": "0.76.3",
@@ -175,20 +175,20 @@
     "react-native-drawer-layout": "^4.0.4",
     "react-native-gesture-handler": "2.20.2",
     "react-native-get-random-values": "~1.11.0",
-    "react-native-image-crop-picker": "^0.41.6",
+    "react-native-image-crop-picker": "0.41.6",
     "react-native-ios-context-menu": "^1.15.3",
     "react-native-keyboard-controller": "^1.14.5",
-    "react-native-mmkv": "^2.12.2",
+    "react-native-mmkv": "3.1.0",
     "react-native-pager-view": "6.6.1",
     "react-native-picker-select": "^9.3.1",
     "react-native-progress": "bluesky-social/react-native-progress",
     "react-native-qrcode-styled": "^0.3.3",
     "react-native-reanimated": "3.17.0-nightly-20241211-17e89ca24",
-    "react-native-root-siblings": "^4.1.1",
+    "react-native-root-siblings": "^5.0.1",
     "react-native-safe-area-context": "4.14.0",
     "react-native-screens": "~4.3.0",
-    "react-native-svg": "^15.8.0",
-    "react-native-uitextview": "^1.4.0",
+    "react-native-svg": "^15.10.1",
+    "react-native-uitextview": "2.0.0-rc.0",
     "react-native-url-polyfill": "^1.3.0",
     "react-native-uuid": "^2.0.2",
     "react-native-view-shot": "^4.0.3",
@@ -203,7 +203,7 @@
     "tippy.js": "^6.3.7",
     "tlds": "^1.234.0",
     "tldts": "^6.1.46",
-    "zeego": "^1.6.2",
+    "zeego": "^1.10.0",
     "zod": "^3.20.2"
   },
   "devDependencies": {

patches/@mattermost+react-native-paste-input+0.8.1-rc.6.patch

@@ -0,0 +1,126 @@
+diff --git a/node_modules/@mattermost/react-native-paste-input/android/src/main/jni/CMakeLists.txt b/node_modules/@mattermost/react-native-paste-input/android/src/main/jni/CMakeLists.txt
+index f9e4dfc..c71ef6e 100644
+--- a/node_modules/@mattermost/react-native-paste-input/android/src/main/jni/CMakeLists.txt
++++ b/node_modules/@mattermost/react-native-paste-input/android/src/main/jni/CMakeLists.txt
+@@ -20,26 +20,10 @@ target_include_directories(react_codegen_PasteTextInputSpecs PUBLIC . react/rend
+
+ target_link_libraries(
+   react_codegen_PasteTextInputSpecs
+-  fbjni
+-  folly_runtime
+-  glog
++  reactnative
+   jsi
+-  react_codegen_rncore
+-  react_debug
+-  react_nativemodule_core
+-  react_featureflags
+-  react_render_textlayoutmanager
+-  react_render_componentregistry
+-  react_render_core
+-  react_render_debug
+-  react_render_graphics
+-  react_render_imagemanager
+-  react_render_mapbuffer
+-  react_utils
+-  rrc_view
+-  rrc_text
+-  rrc_textinput
+-  yoga
++  fbjni
++  android
+   ${log-lib}
+ )
+
+diff --git a/node_modules/@mattermost/react-native-paste-input/ios/PasteInputView.m b/node_modules/@mattermost/react-native-paste-input/ios/PasteInputView.m
+index e916023..811574c 100644
+--- a/node_modules/@mattermost/react-native-paste-input/ios/PasteInputView.m
++++ b/node_modules/@mattermost/react-native-paste-input/ios/PasteInputView.m
+@@ -22,6 +22,11 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
+     _backedTextInputView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+     _backedTextInputView.textInputDelegate = self;
+
++    // Disable inline predictions to prevent jank in the composer
++    if (@available(iOS 17.0, *)) {
++      _backedTextInputView.inlinePredictionType = UITextInlinePredictionTypeNo;
++    }
++
+     [self addSubview:_backedTextInputView];
+   }
+
+diff --git a/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInput.mm b/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInput.mm
+index 65aa7d9..c088635 100644
+--- a/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInput.mm
++++ b/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInput.mm
+@@ -361,16 +361,12 @@ - (NSString *)textInputShouldChangeText:(NSString *)text inRange:(NSRange)range
+
+   if (!_backedTextInputView.textWasPasted) {
+     if (_eventEmitter) {
+-      KeyPressMetrics keyPressMetrics;
++      TextInputEventEmitter::KeyPressMetrics keyPressMetrics;
+       keyPressMetrics.text = RCTStringFromNSString(text);
+       keyPressMetrics.eventCount = _mostRecentEventCount;
+
+-        const auto eventEmitter = [self getEventEmitter];
+-      if (props.onKeyPressSync) {
+-        eventEmitter->onKeyPressSync(keyPressMetrics);
+-      } else {
+-        eventEmitter->onKeyPress(keyPressMetrics);
+-      }
++      const auto eventEmitter = [self getEventEmitter];
++      eventEmitter->onKeyPress(keyPressMetrics);
+     }
+   }
+
+@@ -416,12 +412,7 @@ - (void)textInputDidChange
+
+   if (_eventEmitter) {
+     const auto eventEmitter = [self getEventEmitter];
+-    const auto &props = static_cast<const PasteTextInputProps &>(*_props);
+-    if (props.onChangeSync) {
+-      eventEmitter->onChangeSync([self _textInputMetrics]);
+-    } else {
+-      eventEmitter->onChange([self _textInputMetrics]);
+-    }
++    eventEmitter->onChange([self _textInputMetrics]);
+   }
+ }
+
+@@ -551,9 +542,9 @@ - (void)handleInputAccessoryDoneButton
+
+ #pragma mark - Other
+
+-- (TextInputMetrics)_textInputMetrics
++- (TextInputEventEmitter::Metrics)_textInputMetrics
+ {
+-  TextInputMetrics metrics;
++  TextInputEventEmitter::Metrics metrics;
+   metrics.text = RCTStringFromNSString(_backedTextInputView.attributedText.string);
+   metrics.selectionRange = [self _selectionRange];
+   metrics.eventCount = _mostRecentEventCount;
+diff --git a/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputManager.mm b/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputManager.mm
+index d1aee72..ba8934e 100644
+--- a/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputManager.mm
++++ b/node_modules/@mattermost/react-native-paste-input/ios/PasteTextInputManager.mm
+@@ -10,20 +10,14 @@
+ #import <React/RCTUIManagerUtils.h>
+ #import <React/RCTShadowView+Layout.h>
+ #import <React/RCTShadowView.h>
++#import <React/RCTMultilineTextInputViewManager.h>
+
+ #import "PasteTextInput.h"
+ #import "PasteInputView.h"
+
+-#ifdef RCT_NEW_ARCH_ENABLED
+-@interface PasteTextInputManager : RCTViewManager
+-@end
+-#else
+-#import <React/RCTMultilineTextInputViewManager.h>
+-
+ @interface PasteTextInputManager : RCTMultilineTextInputViewManager
+
+ @end
+-#endif
+
+ @implementation PasteTextInputManager {
+     NSHashTable<RCTBaseTextInputShadowView *> *_shadowViews;