fix!: upgrade nitro-modules to 0.35.0

android/src/main/java/com/rive/RivePackage.kt

@@ -6,6 +6,7 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.module.model.ReactModuleInfoProvider
 import com.facebook.react.uimanager.ViewManager
 import com.margelo.nitro.rive.riveOnLoad
+import com.margelo.nitro.rive.views.HybridRiveViewManager
 
 class RivePackage : BaseReactPackage() {
   override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<in Nothing, in Nothing>> {
@@ -16,7 +17,7 @@ class RivePackage : BaseReactPackage() {
     }
 
     val viewManagers: MutableList<ViewManager<*, *>> = ArrayList()
-    viewManagers.add(RiveViewManager())
+    viewManagers.add(HybridRiveViewManager())
     return viewManagers
   }
 

android/src/main/java/com/rive/RiveReactNativeView.kt

@@ -77,22 +77,14 @@ class RiveReactNativeView(context: ThemedReactContext) : FrameLayout(context) {
   private var eventListeners: MutableList<RiveFileController.RiveEventListener> = mutableListOf()
   private val viewReadyDeferred = CompletableDeferred<Boolean>()
   private var _activeStateMachineName: String? = null
-  private var willDispose = false
-
   init {
     riveAnimationView = ReactNativeRiveAnimationView(context)
     addView(riveAnimationView)
   }
 
-  fun dispose() {
-    willDispose = true
-  }
-
   override fun onDetachedFromWindow() {
-    if (willDispose) {
-      riveAnimationView?.dispose()
-      removeEventListeners()
-    }
+    riveAnimationView?.dispose()
+    removeEventListeners()
     super.onDetachedFromWindow()
   }
 

example/ios/Podfile.lock

@@ -1904,7 +1904,7 @@ PODS:
     - ReactCommon/turbomodule/core
     - RNWorklets
     - Yoga
-  - RNRive (0.2.4):
+  - RNRive (0.2.5):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -2330,7 +2330,7 @@ SPEC CHECKSUMS:
   RNCPicker: 28c076ae12a1056269ec0305fe35fac3086c477d
   RNGestureHandler: 6b39f4e43e4b3a0fb86de9531d090ff205a011d5
   RNReanimated: 66b68ebe3baf7ec9e716bd059d700726f250d344
-  RNRive: 5abb7e84bce9e6a0fe3ede1b366c442ac67dda75
+  RNRive: acc0d2356fbb2f65dce95b25cc154bdd0c8ceecc
   RNWorklets: b1faafefb82d9f29c4018404a0fb33974b494a7b
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   Yoga: 9f110fc4b7aa538663cba3c14cbb1c335f43c13f

example/package.json

@@ -21,7 +21,7 @@
     "react": "19.0.0",
     "react-native": "0.79.2",
     "react-native-gesture-handler": "2.29.1",
-    "react-native-nitro-modules": "0.33.2",
+    "react-native-nitro-modules": "0.35.0",
     "react-native-reanimated": "4.1.5",
     "react-native-safe-area-context": "^5.4.0",
     "react-native-worklets": "0.6.1"

expo-example/package.json

@@ -35,7 +35,7 @@
     "react-dom": "19.1.0",
     "react-native": "0.81.5",
     "react-native-gesture-handler": "2.29.1",
-    "react-native-nitro-modules": "0.33.2",
+    "react-native-nitro-modules": "0.35.0",
     "react-native-reanimated": "4.1.5",
     "react-native-safe-area-context": "~5.6.0",
     "react-native-screens": "~4.16.0",

ios/DataSource.swift

@@ -24,7 +24,7 @@ enum DataSource {
     return .bundle(resource: name, extension: ext.isEmpty ? nil : ext)
   }
 
-  static func bytes(from buffer: ArrayBufferHolder) -> DataSource {
+  static func bytes(from buffer: ArrayBuffer) -> DataSource {
     return .bytes(data: buffer.toData(copyIfNeeded: false))
   }
 

ios/HybridRiveFileFactory.swift

@@ -145,7 +145,7 @@ final class HybridRiveFileFactory: HybridRiveFileFactorySpec, @unchecked Sendabl
     return try fromResource(resource: resource, loadCdn: loadCdn, referencedAssets: nil)
   }
 
-  func fromBytes(bytes: ArrayBufferHolder, loadCdn: Bool, referencedAssets: ReferencedAssetsType?)
+  func fromBytes(bytes: ArrayBuffer, loadCdn: Bool, referencedAssets: ReferencedAssetsType?)
     throws -> Promise<
       (any HybridRiveFileSpec)
     > {

ios/HybridRiveImageFactory.swift

@@ -20,7 +20,7 @@ final class HybridRiveImageFactory: HybridRiveImageFactorySpec {
     return loadFromDataSource(.bundle(nameWithExtension: resource))
   }
 
-  func loadFromBytesAsync(bytes: ArrayBufferHolder) throws -> Promise<(any HybridRiveImageSpec)> {
+  func loadFromBytesAsync(bytes: ArrayBuffer) throws -> Promise<(any HybridRiveImageSpec)> {
     return loadFromDataSource(.bytes(from: bytes))
   }
 }