update

Author: mfazekas

example/src/App.tsx

@@ -13,6 +13,7 @@ import TemplatePage from './pages/TemplatePage';
 import EventsExample from './pages/RiveEventsExample';
 import StateMachineInputsExample from './pages/RiveStateMachineInputsExample';
 import TextRunExample from './pages/RiveTextRunExample';
+import OutOfBandAssets from './pages/OutOfBandAssets';
 
 type RootStackParamList = {
   Home: undefined;
@@ -22,6 +23,7 @@ type RootStackParamList = {
   RiveStateMachineInputs: undefined;
   RiveTextRun: undefined;
   Template: undefined;
+  OutOfBandAssets: undefined;
 };
 
 const Stack = createStackNavigator<RootStackParamList>();
@@ -63,6 +65,12 @@ function HomeScreen({ navigation }: { navigation: any }) {
         >
           <Text style={styles.buttonText}>Rive Text Run Example</Text>
         </TouchableOpacity>
+        <TouchableOpacity
+          style={styles.button}
+          onPress={() => navigation.navigate('OutOfBandAssets')}
+        >
+          <Text style={styles.buttonText}>Out of band assets</Text>
+        </TouchableOpacity>
         <TouchableOpacity
           style={styles.button}
           onPress={() => navigation.navigate('Template')}
@@ -118,6 +126,11 @@ export default function App() {
           component={TextRunExample}
           options={{ title: 'Rive Text Runs' }}
         />
+        <Stack.Screen
+          name="OutOfBandAssets"
+          component={OutOfBandAssets}
+          options={{ title: 'Out of Band Asset' }}
+        />
         <Stack.Screen
           name="Template"
           component={TemplatePage}

ios/HybridRiveFile.swift

@@ -6,14 +6,15 @@ class HybridRiveFile: HybridRiveFileSpec {
   var riveFile: RiveFile?
   var referencedAssetCache: ReferencedAssetCache?
   var assetLoader: ReferencedAssetLoader?
+  var cachedFactory: RiveFactory?
   private var weakViews: [Weak<RiveReactNativeView>] = []
 
   public func setRiveFile(_ riveFile: RiveFile) {
     self.riveFile = riveFile
   }
 
   func registerView(_ view: RiveReactNativeView) {
-    weakViews.append(Weak(value: view))
+    weakViews.append(Weak(view))
   }
 
   func unregisterView(_ view: RiveReactNativeView) {
@@ -78,7 +79,11 @@ class HybridRiveFile: HybridRiveFileSpec {
     var hasChanged = false
     for (key, assetData) in assetsData {
       guard let asset = cache[key] else { continue }
-      loader.loadAsset(source: assetData, asset: asset)
+      if let riveFactory = cachedFactory {
+        loader.loadAsset(source: assetData, asset: asset, factory: riveFactory)
+      } else {
+        RCTLogError("[RiveFile] no factory available for update")
+      }
       hasChanged = true
     }
 

ios/HybridRiveFileFactory.swift

@@ -4,17 +4,18 @@ import RiveRuntime
 final class HybridRiveFileFactory: HybridRiveFileFactorySpec {
   let assetLoader = ReferencedAssetLoader()
 
-  private func buildRiveFile(data: Data, loadCdn: Bool, referencedAssets: ReferencedAssetsType?) throws -> (file: RiveFile, cache: ReferencedAssetCache, loader: ReferencedAssetLoader?)  {
+  private func buildRiveFile(data: Data, loadCdn: Bool, referencedAssets: ReferencedAssetsType?) throws -> (file: RiveFile, cache: ReferencedAssetCache, factory: RiveFactory?, loader: ReferencedAssetLoader?)  {
     var referencedAssetCache = SendableRef(ReferencedAssetCache())
-    let customLoader = assetLoader.createCustomLoader(referencedAssets: referencedAssets, cache: referencedAssetCache)
+    var factoryCache: SendableRef<RiveFactory?> = .init(nil)
+    let customLoader = assetLoader.createCustomLoader(referencedAssets: referencedAssets, cache: referencedAssetCache, factory: factoryCache)
 
     let riveFile = if let customLoader = customLoader {
       try RiveFile(data: data, loadCdn: loadCdn, customAssetLoader: customLoader)
     } else {
       try RiveFile(data: data, loadCdn: loadCdn)
     }
 
-    return (file: riveFile, cache: referencedAssetCache.value, loader: customLoader != nil ? assetLoader : nil)
+    return (file: riveFile, cache: referencedAssetCache.value, factory: factoryCache.value, loader: customLoader != nil ? assetLoader : nil)
   }
 
   // MARK: Public Methods
@@ -44,6 +45,9 @@ final class HybridRiveFileFactory: HybridRiveFileFactorySpec {
         let hybridRiveFile = HybridRiveFile()
         hybridRiveFile.riveFile = result.file
         hybridRiveFile.referencedAssetCache = result.cache
+        if let factory = result.factory {
+          hybridRiveFile.cachedFactory = factory
+        }
         hybridRiveFile.assetLoader = result.loader
         return hybridRiveFile
       } catch let error as NSError {
@@ -105,11 +109,12 @@ final class HybridRiveFileFactory: HybridRiveFileFactorySpec {
       do {
         let assetLoader = self.assetLoader
         let referencedAssetCache = SendableRef(ReferencedAssetCache())
+        let factoryCache = SendableRef<RiveFactory?>(nil)
         let riveFile = try await withCheckedThrowingContinuation { continuation in
           DispatchQueue.global(qos: .userInitiated).async {
             do {
               let riveFile =
-                if let customLoader = assetLoader.createCustomLoader(referencedAssets: referencedAssets, cache: referencedAssetCache) {
+              if let customLoader = assetLoader.createCustomLoader(referencedAssets: referencedAssets, cache: referencedAssetCache, factory: factoryCache) {
                   try RiveFile(resource: resource, loadCdn: loadCdn, customAssetLoader: customLoader)
                 } else {
                   try RiveFile(resource: resource, loadCdn: loadCdn)

ios/ReferencedAssetLoader.swift

@@ -1,13 +1,6 @@
 import NitroModules
 import RiveRuntime
 
-final class Ref<T> {
-  var value: T
-  init(_ value: T) {
-    self.value = value
-  }
-}
-
 struct FileAndCache {
   var file: RiveFile
   var cache: [String: RiveFileAsset]
@@ -194,7 +187,7 @@ final class ReferencedAssetLoader {
     loadAssetInternal(source: source, asset: asset, factory: factory)
   }
 
-  func createCustomLoader(referencedAssets: ReferencedAssetsType?, cache: Ref<ReferencedAssetCache>)
+  func createCustomLoader(referencedAssets: ReferencedAssetsType?, cache: SendableRef<ReferencedAssetCache>, factory factoryOut: SendableRef<RiveFactory?>)
     -> LoadAsset?
   {
     guard let referencedAssets = referencedAssets, let referencedAssets = referencedAssets.data
@@ -209,6 +202,7 @@ final class ReferencedAssetLoader {
       let usedKey = assetByUniqueName != nil ? asset.uniqueName() : asset.name()
 
       cache.value[asset.uniqueName()] = asset
+      factoryOut.value = factory
 
       self.loadAssetInternal(source: assetData, asset: asset, factory: factory)