bump it bop it upgrade it (rn 79/expo 53) (#8281)

* basic bumps

* more tweaking

* fix rn patch

* fix crop picker patch

* fix media library patch

* rm unnecessary patch

* fix notifications patch

* update bottomsheet

* Update withAppDelegateReferrer.js

* Delete withNoBundleCompression.js

* rm withNoBundleCompression plugin

* rm findLast shim

* metro package exports is enabled by default

* update react/react-dom/react-compiler

* fix reanimated issue

* vendor expo-ized emoji popup

* fix types

* hackfix view full thread

* Update EmojiPickerModule.podspec

* more upgrades

* fix multiformats package version

* add baseurl

* bump mmkv

* bumps

* update react-keyed-flatten-children

* bump locale packages

* fix emoji picker dark mode

* rn upgrades

* Revert "bump locale packages"

This reverts commit fc82f0f173032127dd7c18ed0316ae26f53db51d.

* upgrade testing-library

* rm test renderer

* update patch name minors

* rm findNodeHandle from tabbar

* only do scrollview tag thing on ios

* disable package exports

* update expo notifications handler

* memoize emoji picker styles

* fix tests, mock multiformats

* bump some dev deps with RC versions

* completely rearchitect toasts

* rm logs

* layout animation config for composer footer

* disable autolinking for patched libs

* undo lingui changes

* version bump from release candidate to 0.1

* update atproto deps

* rm @did-plc/server

* fix key issue (maybe)

* move URL polyfill to the polyfill file

* fix yarn lock

* upgrade to 53.0.3

* reanimated layout anim bug patch

* workletize a function that wasn't getting autoworkletized anymore (#8309)

* bump to expo 53.0.4

* bump RN to 0.79.2

* fix yarn lock ci

* Revert "completely rearchitect toasts"

This reverts commit 2e2fcaeeed527580a6c485718544b85e8b4f52b9.

* final upgrades

* chore: cleanup yarn lock

* prettier

---------

Co-authored-by: Samuel Newman <mozzius@protonmail.com>

23 files changed, 319 insertions, 34 deletions

diff --git a/modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/BottomSheetView.kt b/modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/BottomSheetView.kt
index 5df163b64..31eb739a6 100644
--- a/modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/BottomSheetView.kt
+++ b/modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/BottomSheetView.kt
@@ -317,6 +317,9 @@ class BottomSheetView(
   // View overrides to pass to DialogRootViewGroup instead
 
   override fun dispatchProvideStructure(structure: ViewStructure?) {
+    if (structure == null) {
+      return
+    }
     dialogRootViewGroup.dispatchProvideStructure(structure)
   }
 
diff --git a/modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/DialogRootViewGroup.kt b/modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/DialogRootViewGroup.kt
index c022924e9..4b02bae9f 100644
--- a/modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/DialogRootViewGroup.kt
+++ b/modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/DialogRootViewGroup.kt
@@ -139,19 +139,7 @@ class DialogRootViewGroup(
     return super.onHoverEvent(event)
   }
 
-  @Deprecated("Deprecated in Java")
-  override fun onChildStartedNativeGesture(ev: MotionEvent?) {
-    eventDispatcher?.let {
-      if (ev != null) {
-        jSTouchDispatcher.onChildStartedNativeGesture(ev, it)
-      }
-    }
-  }
-
-  override fun onChildStartedNativeGesture(
-    childView: View,
-    ev: MotionEvent,
-  ) {
+  override fun onChildStartedNativeGesture(childView: View?, ev: MotionEvent) {
     eventDispatcher?.let { jSTouchDispatcher.onChildStartedNativeGesture(ev, it) }
     jSPointerDispatcher?.onChildStartedNativeGesture(childView, ev, eventDispatcher)
   }
diff --git a/modules/expo-bluesky-gif-view/ios/ExpoBlueskyGifView.podspec b/modules/expo-bluesky-gif-view/ios/ExpoBlueskyGifView.podspec
index 352812640..7640a5fc7 100644
--- a/modules/expo-bluesky-gif-view/ios/ExpoBlueskyGifView.podspec
+++ b/modules/expo-bluesky-gif-view/ios/ExpoBlueskyGifView.podspec
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.static_framework = true
 
   s.dependency 'ExpoModulesCore'
-  s.dependency 'SDWebImage', '~> 5.19.1'
+  s.dependency 'SDWebImage', '~> 5.21.0'
   s.dependency 'SDWebImageWebPCoder', '~> 0.14.6'
 
   # Swift/Objective-C compatibility
diff --git a/modules/expo-emoji-picker/LICENSE b/modules/expo-emoji-picker/LICENSE
new file mode 100644
index 000000000..aa0254ccb
--- /dev/null
+++ b/modules/expo-emoji-picker/LICENSE
@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) 2025 Alan Hughes
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/modules/expo-emoji-picker/README.md b/modules/expo-emoji-picker/README.md
new file mode 100644
index 000000000..d2fb3ae05
--- /dev/null
+++ b/modules/expo-emoji-picker/README.md
@@ -0,0 +1,3 @@
+# expo-emoji-picker
+
+Based on [react-native-emoji-popup](https://github.com/okwasniewski/react-native-emoji-popup) and [expo-emoji-picker](https://github.com/alanjhughes/expo-emoji-picker)
diff --git a/modules/expo-emoji-picker/android/build.gradle b/modules/expo-emoji-picker/android/build.gradle
new file mode 100644
index 000000000..d34288dc7
--- /dev/null
+++ b/modules/expo-emoji-picker/android/build.gradle
@@ -0,0 +1,46 @@
+apply plugin: 'com.android.library'
+
+group = 'expo.community.modules.emojipicker'
+version = '0.1.0'
+
+def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
+apply from: expoModulesCorePlugin
+applyKotlinExpoModulesCorePlugin()
+useCoreDependencies()
+useExpoPublishing()
+
+// If you want to use the managed Android SDK versions from expo-modules-core, set this to true.
+// The Android SDK versions will be bumped from time to time in SDK releases and may introduce breaking changes in your module code.
+// Most of the time, you may like to manage the Android SDK versions yourself.
+def useManagedAndroidSdkVersions = false
+if (useManagedAndroidSdkVersions) {
+  useDefaultAndroidSdkVersions()
+} else {
+  buildscript {
+    // Simple helper that allows the root project to override versions declared by this library.
+    ext.safeExtGet = { prop, fallback ->
+      rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+    }
+  }
+  project.android {
+    compileSdkVersion safeExtGet("compileSdkVersion", 34)
+    defaultConfig {
+      minSdkVersion safeExtGet("minSdkVersion", 21)
+      targetSdkVersion safeExtGet("targetSdkVersion", 34)
+    }
+  }
+}
+
+android {
+  namespace "expo.community.modules.emojipicker"
+  defaultConfig {
+    versionCode 1
+    versionName "0.1.0"
+  }
+  lintOptions {
+    abortOnError false
+  }
+  dependencies {
+    implementation "androidx.emoji2:emoji2-emojipicker:1.5.0"
+  }
+}
diff --git a/modules/expo-emoji-picker/android/src/main/AndroidManifest.xml b/modules/expo-emoji-picker/android/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..bdae66c8f
--- /dev/null
+++ b/modules/expo-emoji-picker/android/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<manifest>
+</manifest>
diff --git a/modules/expo-emoji-picker/android/src/main/java/expo/community/modules/emojipicker/EmojiPickerModule.kt b/modules/expo-emoji-picker/android/src/main/java/expo/community/modules/emojipicker/EmojiPickerModule.kt
new file mode 100644
index 000000000..ebdc7a35e
--- /dev/null
+++ b/modules/expo-emoji-picker/android/src/main/java/expo/community/modules/emojipicker/EmojiPickerModule.kt
@@ -0,0 +1,15 @@
+package expo.community.modules.emojipicker
+
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
+import java.net.URL
+
+class EmojiPickerModule : Module() {
+    override fun definition() = ModuleDefinition {
+        Name("EmojiPicker")
+
+        View(EmojiPickerModuleView::class) {
+            Events("onEmojiSelected")
+        }
+    }
+}
diff --git a/modules/expo-emoji-picker/android/src/main/java/expo/community/modules/emojipicker/EmojiPickerModuleView.kt b/modules/expo-emoji-picker/android/src/main/java/expo/community/modules/emojipicker/EmojiPickerModuleView.kt
new file mode 100644
index 000000000..a6e5a066f
--- /dev/null
+++ b/modules/expo-emoji-picker/android/src/main/java/expo/community/modules/emojipicker/EmojiPickerModuleView.kt
@@ -0,0 +1,40 @@
+package expo.community.modules.emojipicker
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.res.Configuration
+import androidx.emoji2.emojipicker.EmojiPickerView
+import expo.modules.kotlin.AppContext
+import expo.modules.kotlin.viewevent.EventDispatcher
+import expo.modules.kotlin.views.ExpoView
+
+
+@SuppressLint("ViewConstructor")
+class EmojiPickerModuleView(context: Context, appContext: AppContext) :
+    ExpoView(context, appContext) {
+    private var emojiView: EmojiPickerView = EmojiPickerView(context)
+    private val onEmojiSelected by EventDispatcher()
+
+    init {
+        setupView()
+    }
+
+    private fun setupView() {
+        addView(
+            emojiView, LayoutParams(
+                LayoutParams.MATCH_PARENT,
+                LayoutParams.MATCH_PARENT
+            )
+        )
+
+        emojiView.setOnEmojiPickedListener { emoji ->
+            onEmojiSelected(mapOf("emoji" to emoji.emoji))
+        }
+    }
+
+    override fun onConfigurationChanged(newConfig: Configuration?) {
+        super.onConfigurationChanged(newConfig)
+        removeView(emojiView)
+        setupView()
+    }
+}
diff --git a/modules/expo-emoji-picker/expo-module.config.json b/modules/expo-emoji-picker/expo-module.config.json
new file mode 100644
index 000000000..7576240d1
--- /dev/null
+++ b/modules/expo-emoji-picker/expo-module.config.json
@@ -0,0 +1,9 @@
+{
+  "platforms": ["apple", "android"],
+  "apple": {
+    "modules": ["EmojiPickerModule"]
+  },
+  "android": {
+    "modules": ["expo.community.modules.emojipicker.EmojiPickerModule"]
+  }
+}
diff --git a/modules/expo-emoji-picker/index.ts b/modules/expo-emoji-picker/index.ts
new file mode 100644
index 000000000..a555b730a
--- /dev/null
+++ b/modules/expo-emoji-picker/index.ts
@@ -0,0 +1,3 @@
+export {default as EmojiPicker} from './src/EmojiPicker'
+export {default} from './src/EmojiPickerModule'
+export * from './src/EmojiPickerModule.types'
diff --git a/modules/expo-emoji-picker/ios/EmojiPickerModule.podspec b/modules/expo-emoji-picker/ios/EmojiPickerModule.podspec
new file mode 100644
index 000000000..e6a982a70
--- /dev/null
+++ b/modules/expo-emoji-picker/ios/EmojiPickerModule.podspec
@@ -0,0 +1,25 @@
+Pod::Spec.new do |s|
+  s.name           = 'EmojiPickerModule'
+  s.version        = '1.0.0'
+  s.summary        = 'An emoji picker for use in Bluesky'
+  s.description    = 'An emoji picker for use in Bluesky'
+  s.author         = 'alanjhughes'
+  s.homepage       = 'https://github.com/bluesky-social/social-app'
+  s.platforms      = {
+    :ios => '15.1',
+    :tvos => '15.1'
+  }
+  s.source         = { git: '' }
+  s.swift_version  = '5.4'
+  s.static_framework = true
+
+  s.dependency 'ExpoModulesCore'
+  s.dependency 'MCEmojiPicker'
+
+  # Swift/Objective-C compatibility
+  s.pod_target_xcconfig = {
+    'DEFINES_MODULE' => 'YES',
+  }
+
+  s.source_files = "**/*.{h,m,mm,swift,hpp,cpp}"
+end
diff --git a/modules/expo-emoji-picker/ios/EmojiPickerModule.swift b/modules/expo-emoji-picker/ios/EmojiPickerModule.swift
new file mode 100644
index 000000000..57b6f959a
--- /dev/null
+++ b/modules/expo-emoji-picker/ios/EmojiPickerModule.swift
@@ -0,0 +1,11 @@
+import ExpoModulesCore
+
+public class EmojiPickerModule: Module {
+  public func definition() -> ModuleDefinition {
+    Name("EmojiPicker")
+
+    View(EmojiPickerView.self) {
+      Events("onEmojiSelected")
+    }
+  }
+}
diff --git a/modules/expo-emoji-picker/ios/EmojiPickerView.swift b/modules/expo-emoji-picker/ios/EmojiPickerView.swift
new file mode 100644
index 000000000..65089a2af
--- /dev/null
+++ b/modules/expo-emoji-picker/ios/EmojiPickerView.swift
@@ -0,0 +1,30 @@
+import ExpoModulesCore
+import WebKit
+import MCEmojiPicker
+
+class EmojiPickerView: ExpoView, MCEmojiPickerDelegate {
+  let onEmojiSelected = EventDispatcher()
+
+  override func layoutSubviews() {
+    let tapGesture = UITapGestureRecognizer(target: self, action: #selector(handleTap(_:)))
+    self.addGestureRecognizer(tapGesture)
+  }
+
+  @objc func handleTap(_ gesture: UITapGestureRecognizer) {
+    presentEmojiPicker()
+  }
+
+  func presentEmojiPicker() {
+    let emojiPicker = MCEmojiPickerViewController()
+    let reactRootVC = reactViewController()
+    emojiPicker.sourceView = self
+    emojiPicker.delegate = self
+    reactRootVC?.present(emojiPicker, animated: true)
+  }
+
+  func didGetEmoji(emoji: String) {
+    onEmojiSelected([
+      "emoji": emoji
+    ])
+  }
+}
diff --git a/modules/expo-emoji-picker/src/EmojiPicker.android.tsx b/modules/expo-emoji-picker/src/EmojiPicker.android.tsx
new file mode 100644
index 000000000..d8493b72e
--- /dev/null
+++ b/modules/expo-emoji-picker/src/EmojiPicker.android.tsx
@@ -0,0 +1,28 @@
+import {useMemo} from 'react'
+import {useColorScheme} from 'react-native'
+
+import {type EmojiPickerViewProps} from './EmojiPickerModule.types'
+import EmojiPickerNativeView from './EmojiPickerView'
+
+const EmojiPicker = ({onEmojiSelected}: EmojiPickerViewProps) => {
+  const scheme = useColorScheme()
+  const styles = useMemo(
+    () =>
+      ({
+        flex: 1,
+        width: '100%',
+        backgroundColor: scheme === 'dark' ? '#000' : '#fff',
+      } as const),
+    [scheme],
+  )
+
+  return (
+    <EmojiPickerNativeView
+      onEmojiSelected={emoji => {
+        onEmojiSelected(emoji)
+      }}
+      style={styles}
+    />
+  )
+}
+export default EmojiPicker
diff --git a/modules/expo-emoji-picker/src/EmojiPicker.tsx b/modules/expo-emoji-picker/src/EmojiPicker.tsx
new file mode 100644
index 000000000..8fee11df7
--- /dev/null
+++ b/modules/expo-emoji-picker/src/EmojiPicker.tsx
@@ -0,0 +1,15 @@
+import {type EmojiPickerViewProps} from './EmojiPickerModule.types'
+import EmojiPickerNativeView from './EmojiPickerView'
+
+const EmojiPicker = ({children, onEmojiSelected}: EmojiPickerViewProps) => {
+  return (
+    <EmojiPickerNativeView
+      onEmojiSelected={emoji => {
+        onEmojiSelected(emoji)
+      }}>
+      {children}
+    </EmojiPickerNativeView>
+  )
+}
+
+export default EmojiPicker
diff --git a/modules/expo-emoji-picker/src/EmojiPickerModule.ts b/modules/expo-emoji-picker/src/EmojiPickerModule.ts
new file mode 100644
index 000000000..a5b04e662
--- /dev/null
+++ b/modules/expo-emoji-picker/src/EmojiPickerModule.ts
@@ -0,0 +1,5 @@
+import {NativeModule, requireNativeModule} from 'expo'
+
+declare class EmojiPickerModule extends NativeModule {}
+
+export default requireNativeModule<EmojiPickerModule>('EmojiPicker')
diff --git a/modules/expo-emoji-picker/src/EmojiPickerModule.types.ts b/modules/expo-emoji-picker/src/EmojiPickerModule.types.ts
new file mode 100644
index 000000000..14690a38a
--- /dev/null
+++ b/modules/expo-emoji-picker/src/EmojiPickerModule.types.ts
@@ -0,0 +1,20 @@
+import {type ViewProps} from 'react-native'
+
+export type EmojiSelectionListener = (event: {
+  nativeEvent: SelectionEvent
+}) => void
+
+export type SelectionEvent = {
+  emoji: string
+}
+
+export type EmojiPickerViewProps = ViewProps & {
+  /*
+   * Callback that will be called when an emoji is selected.
+   */
+  onEmojiSelected: (emoji: string) => void
+}
+
+export type EmojiPickerNativeViewProps = ViewProps & {
+  onEmojiSelected: EmojiSelectionListener
+}
diff --git a/modules/expo-emoji-picker/src/EmojiPickerView.tsx b/modules/expo-emoji-picker/src/EmojiPickerView.tsx
new file mode 100644
index 000000000..0dff25fb5
--- /dev/null
+++ b/modules/expo-emoji-picker/src/EmojiPickerView.tsx
@@ -0,0 +1,21 @@
+import {requireNativeView} from 'expo'
+import type * as React from 'react'
+
+import {
+  type EmojiPickerNativeViewProps,
+  type EmojiPickerViewProps,
+} from './EmojiPickerModule.types'
+
+const NativeView: React.ComponentType<EmojiPickerNativeViewProps> =
+  requireNativeView('EmojiPicker')
+
+export default function EmojiPicker(props: EmojiPickerViewProps) {
+  return (
+    <NativeView
+      {...props}
+      onEmojiSelected={({nativeEvent}) => {
+        props.onEmojiSelected(nativeEvent.emoji)
+      }}
+    />
+  )
+}
diff --git a/modules/expo-scroll-forwarder/ios/ExpoScrollForwarderView.swift b/modules/expo-scroll-forwarder/ios/ExpoScrollForwarderView.swift
index 15993ef29..e6ebef1d3 100644
--- a/modules/expo-scroll-forwarder/ios/ExpoScrollForwarderView.swift
+++ b/modules/expo-scroll-forwarder/ios/ExpoScrollForwarderView.swift
@@ -9,7 +9,7 @@ class ExpoScrollForwarderView: ExpoView, UIGestureRecognizerDelegate {
     }
   }
 
-  private var rctScrollView: RCTScrollView?
+  private var scrollView: UIScrollView?
   private var rctRefreshCtrl: RCTRefreshControl?
   private var cancelGestureRecognizers: [UIGestureRecognizer]?
   private var animTimer: Timer?
@@ -68,7 +68,7 @@ class ExpoScrollForwarderView: ExpoView, UIGestureRecognizerDelegate {
   }
 
   @IBAction func callOnPan(_ sender: UIPanGestureRecognizer) {
-    guard let rctsv = self.rctScrollView, let sv = rctsv.scrollView else {
+    guard let sv = self.scrollView else {
       return
     }
 
@@ -113,7 +113,7 @@ class ExpoScrollForwarderView: ExpoView, UIGestureRecognizerDelegate {
   }
 
   func startDecayAnimation(_ translation: CGFloat, _ velocity: CGFloat) {
-    guard let sv = self.rctScrollView?.scrollView else {
+    guard let sv = self.scrollView else {
       return
     }
 
@@ -160,32 +160,49 @@ class ExpoScrollForwarderView: ExpoView, UIGestureRecognizerDelegate {
 
     return offset
   }
-
-  func tryFindScrollView() {
-    guard let scrollViewTag = scrollViewTag else {
-      return
+  
+  private func findScrollView(in view: UIView, foundCount: Int) -> UIScrollView? {
+    var foundCount = foundCount
+    if let sv = view as? UIScrollView { return sv }
+    for child in view.subviews {
+      if let found = findScrollView(in: child, foundCount: foundCount) {
+        if foundCount == 1 {
+          print("found sv: \(found)")
+//          return found
+        } else {
+          print("found sv: \(found)")
+          foundCount += 1
+        }
+      }
     }
+    return nil
+  }
 
+  func tryFindScrollView() {
     // Before we switch to a different scrollview, we always want to remove the cancel gesture recognizer.
     // Otherwise we might end up with duplicates when we switch back to that scrollview.
     self.removeCancelGestureRecognizers()
+    
+    guard let sv = self.findScrollView(in: self.superview!.superview!.superview!, foundCount: 0) else {
+      print("⚠️ ExpoScrollForwarder: couldn’t find UIScrollView under tag \(tag)")
+      return
+    }
 
-    self.rctScrollView = self.appContext?
-      .findView(withTag: scrollViewTag, ofType: RCTScrollView.self)
-    self.rctRefreshCtrl = self.rctScrollView?.scrollView.refreshControl as? RCTRefreshControl
+    self.scrollView = sv
+    self.rctRefreshCtrl = sv.refreshControl as? RCTRefreshControl
 
     self.addCancelGestureRecognizers()
   }
 
   func addCancelGestureRecognizers() {
     self.cancelGestureRecognizers?.forEach { r in
-      self.rctScrollView?.scrollView?.addGestureRecognizer(r)
+      self.scrollView?.addGestureRecognizer(r)
     }
   }
 
   func removeCancelGestureRecognizers() {
     self.cancelGestureRecognizers?.forEach { r in
-      self.rctScrollView?.scrollView?.removeGestureRecognizer(r)
+      self.scrollView?.removeGestureRecognizer(r)
     }
   }
 
@@ -202,7 +219,7 @@ class ExpoScrollForwarderView: ExpoView, UIGestureRecognizerDelegate {
   }
 
   func scrollToOffset(_ offset: Int, animated: Bool = true) {
-    self.rctScrollView?.scroll(toOffset: CGPoint(x: 0, y: offset), animated: animated)
+    self.scrollView?.scrollRectToVisible(CGRect(x: 0, y: offset, width: 0, height:  0), animated: animated)
   }
 
   func stopTimer() {
diff --git a/modules/expo-scroll-forwarder/src/ExpoScrollForwarder.types.ts b/modules/expo-scroll-forwarder/src/ExpoScrollForwarder.types.ts
index 26b9e7553..3f1e4a63d 100644
--- a/modules/expo-scroll-forwarder/src/ExpoScrollForwarder.types.ts
+++ b/modules/expo-scroll-forwarder/src/ExpoScrollForwarder.types.ts
@@ -1,5 +1,3 @@
-import React from 'react'
-
 export interface ExpoScrollForwarderViewProps {
   scrollViewTag: number | null
   children: React.ReactNode
diff --git a/modules/expo-scroll-forwarder/src/ExpoScrollForwarderView.ios.tsx b/modules/expo-scroll-forwarder/src/ExpoScrollForwarderView.ios.tsx
index 21a2b9fb2..18bdb25c8 100644
--- a/modules/expo-scroll-forwarder/src/ExpoScrollForwarderView.ios.tsx
+++ b/modules/expo-scroll-forwarder/src/ExpoScrollForwarderView.ios.tsx
@@ -1,7 +1,6 @@
-import * as React from 'react'
 import {requireNativeViewManager} from 'expo-modules-core'
 
-import {ExpoScrollForwarderViewProps} from './ExpoScrollForwarder.types'
+import {type ExpoScrollForwarderViewProps} from './ExpoScrollForwarder.types'
 
 const NativeView: React.ComponentType<ExpoScrollForwarderViewProps> =
   requireNativeViewManager('ExpoScrollForwarder')
diff --git a/modules/expo-scroll-forwarder/src/ExpoScrollForwarderView.tsx b/modules/expo-scroll-forwarder/src/ExpoScrollForwarderView.tsx
index 0f5d01c13..d66eef7cb 100644
--- a/modules/expo-scroll-forwarder/src/ExpoScrollForwarderView.tsx
+++ b/modules/expo-scroll-forwarder/src/ExpoScrollForwarderView.tsx
@@ -1,6 +1,4 @@
-import React from 'react'
-
-import {ExpoScrollForwarderViewProps} from './ExpoScrollForwarder.types'
+import {type ExpoScrollForwarderViewProps} from './ExpoScrollForwarder.types'
 
 export function ExpoScrollForwarderView({
   children,