Skip to content

fix(iOS): resolve double optional type error in defaultArtboardViewModel #256

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
May 14, 2026
Merged

fix(iOS): resolve double optional type error in defaultArtboardViewModel #256

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
11 changes: 6 additions & 5 deletions ios/HybridRiveFile.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,25 +48,26 @@ class HybridRiveFile: HybridRiveFileSpec, RiveViewSource {
}

func defaultArtboardViewModel(artboardBy: ArtboardBy?) throws -> (any HybridViewModelSpec)? {
guard let file = riveFile else { return nil }
let artboard: RiveArtboard?

if let artboardBy = artboardBy {
switch artboardBy.type {
case .index:
guard let index = artboardBy.index else { return nil }
artboard = try? riveFile?.artboard(from: Int(index))
artboard = try? file.artboard(from: Int(index))
case .name:
guard let name = artboardBy.name else { return nil }
artboard = try? riveFile?.artboard(fromName: name)
artboard = try? file.artboard(fromName: name)
default:
artboard = nil
}
} else {
artboard = try? riveFile?.artboard()
artboard = try? file.artboard()
}

guard let artboard = artboard,
let vm = riveFile?.defaultViewModel(for: artboard) else { return nil }
let vm = file.defaultViewModel(for: artboard) else { return nil }
return HybridViewModel(viewModel: vm)
}

Expand Down
Loading