Skip to content

Commit e530040

Browse files
committed
fix(iOS): resolve double optional type error in defaultArtboardViewModel
Unwrap riveFile upfront to avoid `RiveArtboard??` from `try?` combined with optional chaining. Fixes build failure on Xcode 26.3+. Closes #255
1 parent 16a2a25 commit e530040

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

ios/HybridRiveFile.swift

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,25 +48,26 @@ class HybridRiveFile: HybridRiveFileSpec, RiveViewSource {
4848
}
4949

5050
func defaultArtboardViewModel(artboardBy: ArtboardBy?) throws -> (any HybridViewModelSpec)? {
51+
guard let file = riveFile else { return nil }
5152
let artboard: RiveArtboard?
52-
53+
5354
if let artboardBy = artboardBy {
5455
switch artboardBy.type {
5556
case .index:
5657
guard let index = artboardBy.index else { return nil }
57-
artboard = try? riveFile?.artboard(from: Int(index))
58+
artboard = try? file.artboard(from: Int(index))
5859
case .name:
5960
guard let name = artboardBy.name else { return nil }
60-
artboard = try? riveFile?.artboard(fromName: name)
61+
artboard = try? file.artboard(fromName: name)
6162
default:
6263
artboard = nil
6364
}
6465
} else {
65-
artboard = try? riveFile?.artboard()
66+
artboard = try? file.artboard()
6667
}
6768

6869
guard let artboard = artboard,
69-
let vm = riveFile?.defaultViewModel(for: artboard) else { return nil }
70+
let vm = file.defaultViewModel(for: artboard) else { return nil }
7071
return HybridViewModel(viewModel: vm)
7172
}
7273

0 commit comments

Comments
 (0)