Skip to content

fix(iOS): keep fileRef alive until the customLoaders finished #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mfazekas merged 1 commit into from
Nov 27, 2025
Merged

fix(iOS): keep fileRef alive until the customLoaders finished #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ios/HybridRiveFileFactory.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,20 @@ 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)
factory: factoryCache,
fileRef: fileRef
)

let riveFile =
if let customLoader = customLoader {
try fileWithCustomAssetLoader(prepared, customLoader)
} else {
try file(prepared)
}
fileRef.value = riveFile

let result = (
file: riveFile, cache: referencedAssetCache.value, factory: factoryCache.value,
Expand Down
7 changes: 5 additions & 2 deletions ios/ReferencedAssetLoader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,8 @@ final class ReferencedAssetLoader {

func createCustomLoader(
referencedAssets: ReferencedAssetsType?, cache: SendableRef<ReferencedAssetCache>,
factory factoryOut: SendableRef<RiveFactory?>
factory factoryOut: SendableRef<RiveFactory?>,
fileRef: SendableRef<RiveFile?>
)
-> LoadAsset?
{
Expand All @@ -244,7 +245,9 @@ final class ReferencedAssetLoader {
cache.value[asset.uniqueName()] = asset
factoryOut.value = factory

self.loadAssetInternal(source: assetData, asset: asset, factory: factory, completion: {})
self.loadAssetInternal(source: assetData, asset: asset, factory: factory, completion: {
withExtendedLifetime(fileRef) {}
Copy link
Copy Markdown
Contributor

@HayesGordon HayesGordon Nov 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cool!

})

return true
}
Expand Down
Loading