fix(iOS): eagerly dispose RiveView and break referenced asset retain cycle

android/src/main/java/com/margelo/nitro/rive/HybridRiveView.kt

@@ -51,6 +51,12 @@ class HybridRiveView(val context: ThemedReactContext) : HybridRiveViewSpec() {
     private const val TAG = "HybridRiveView"
   }
 
+  //region Lifecycle
+  override fun dispose() {
+    view.dispose()
+  }
+  //endregion
+
   //region State
   override val view: RiveReactNativeView = RiveReactNativeView(context)
   private var needsReload = false

ios/HybridRiveFileFactory.swift

@@ -36,11 +36,9 @@ final class HybridRiveFileFactory: HybridRiveFileFactorySpec, @unchecked Sendabl
 
               let referencedAssetCache = SendableRef(ReferencedAssetCache())
               let factoryCache: SendableRef<RiveFactory?> = .init(nil)
-              let fileRef: SendableRef<RiveFile?> = .init(nil)
               let customLoader = self.assetLoader.createCustomLoader(
                 referencedAssets: referencedAssets, cache: referencedAssetCache,
-                factory: factoryCache,
-                fileRef: fileRef
+                factory: factoryCache
               )
 
               let riveFile =
@@ -49,7 +47,7 @@ final class HybridRiveFileFactory: HybridRiveFileFactorySpec, @unchecked Sendabl
                 } else {
                   try file(prepared)
                 }
-              fileRef.value = riveFile
+              self.assetLoader.setFileRef(riveFile)
 
               let result = (
                 file: riveFile, cache: referencedAssetCache.value, factory: factoryCache.value,

ios/HybridRiveView.swift

@@ -197,6 +197,13 @@ class HybridRiveView: HybridRiveViewSpec {
     }
   }
 
+  func dispose() {
+    let riveView = view as? RiveReactNativeView
+    DispatchQueue.main.async {
+      riveView?.cleanup()
+    }
+  }
+
   // MARK: Internal State
   private var needsReload = false
   private var dataBindingChanged = false

ios/ReferencedAssetLoader.swift

@@ -11,6 +11,26 @@ func createAssetFileError(_ assetName: String) -> NitroRiveError {
 }
 
 final class ReferencedAssetLoader {
+  private var activeLoadCount = 0
+  private var activeFileRef: RiveFile?
+
+  func setFileRef(_ file: RiveFile) {
+    activeFileRef = file
+  }
+
+  private func retainFile() {
+    activeLoadCount += 1
+  }
+
+  private func releaseFile() {
+    dispatchPrecondition(condition: .onQueue(.main))
+    activeLoadCount -= 1
+    if activeLoadCount <= 0 {
+      activeLoadCount = 0
+      activeFileRef = nil
+    }
+  }
+
   private func handleRiveError(error: Error) {
     RCTLogError("\(error)")
   }
@@ -115,16 +135,15 @@ final class ReferencedAssetLoader {
 
   func createCustomLoader(
     referencedAssets: ReferencedAssetsType?, cache: SendableRef<ReferencedAssetCache>,
-    factory factoryOut: SendableRef<RiveFactory?>,
-    fileRef: SendableRef<RiveFile?>
+    factory factoryOut: SendableRef<RiveFactory?>
   )
     -> LoadAsset?
   {
     guard let referencedAssets = referencedAssets, let referencedAssets = referencedAssets.data
     else {
       return nil
     }
-    return { (asset: RiveFileAsset, _: Data, factory: RiveFactory) -> Bool in
+    return { [weak self] (asset: RiveFileAsset, _: Data, factory: RiveFactory) -> Bool in
       let assetByUniqueName = referencedAssets[asset.uniqueName()]
       guard let assetData = assetByUniqueName ?? referencedAssets[asset.name()] else {
         return false
@@ -133,10 +152,11 @@ final class ReferencedAssetLoader {
       cache.value[asset.uniqueName()] = asset
       factoryOut.value = factory
 
-      self.loadAssetInternal(
+      self?.retainFile()
+      self?.loadAssetInternal(
         source: assetData, asset: asset, factory: factory,
-        completion: {
-          withExtendedLifetime(fileRef) {}
+        completion: { [weak self] in
+          self?.releaseFile()
         })
 
       return true

ios/RiveReactNativeView.swift

@@ -141,7 +141,7 @@
   }
 
   func playIfNeeded() {
     if let baseViewModel = baseViewModel, (baseViewModel.isPlaying == false) {
       Task {
         baseViewModel.play()
       }
@@ -242,7 +242,7 @@
     }
   }
 
-  private func cleanup() {
+  func cleanup() {
     riveView?.removeFromSuperview()
     riveView?.stateMachineDelegate = nil
     riveView = nil

src/core/RiveView.tsx

@@ -1,6 +1,8 @@
-import type { ComponentProps } from 'react';
+import { useEffect, useRef, type ComponentProps } from 'react';
 import { NitroRiveView } from './NitroRiveViewComponent';
 import { RiveErrorType, type RiveError } from './Errors';
+import { callDispose } from './callDispose';
+import type { RiveViewRef } from '../index';
 
 export interface RiveViewProps
   extends Omit<ComponentProps<typeof NitroRiveView>, 'onError'> {
@@ -41,8 +43,31 @@ const defaultOnError = (error: RiveError) =>
  * - pause(): Pauses the Rive graphic
  */
 export function RiveView(props: RiveViewProps) {
-  const { onError, ...rest } = props;
+  const { onError, hybridRef: userHybridRef, ...rest } = props;
   const wrappedOnError = onError ?? defaultOnError;
+  const viewRef = useRef<RiveViewRef | null>(null);
 
-  return <NitroRiveView {...rest} onError={{ f: wrappedOnError }} />;
+  useEffect(() => {
+    return () => {
+      if (viewRef.current) {
+        callDispose(viewRef.current);
+        viewRef.current = null;
+      }
+    };
+  }, []);
+
+  const setRef = (ref: RiveViewRef) => {
+    viewRef.current = ref;
+    if (userHybridRef?.f) {
+      userHybridRef.f(ref);
+    }
+  };
+
+  return (
+    <NitroRiveView
+      {...rest}
+      onError={{ f: wrappedOnError }}
+      hybridRef={{ f: setRef }}
+    />
+  );
 }