Skip to content

Commit 65d3316

Browse files
authored
fix(iOS): null checks in getTrueSheetView (#108)
This PR fixes a crash in onDismiss caused by nil values during app reloads in release builds. Both bridge and the view can be null and this is now handled in getTrueSheetView
1 parent 7467c74 commit 65d3316

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

ios/TrueSheetViewManager.swift

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ class TrueSheetViewManager: RCTViewManager {
2424

2525
// MARK: - Private
2626

27-
private func getTrueSheetView(_ tag: NSNumber) -> TrueSheetView {
27+
private func getTrueSheetView(_ tag: NSNumber) -> TrueSheetView? {
28+
guard let uiManager = bridge?.uiManager else { return nil }
29+
guard let viewForTag = uiManager.view(forReactTag: tag) else { return nil }
2830
// swiftlint:disable force_cast
29-
return bridge.uiManager.view(forReactTag: tag) as! TrueSheetView
31+
return viewForTag as! TrueSheetView
3032
// swiftlint:enable force_cast
3133
}
3234

@@ -35,12 +37,12 @@ class TrueSheetViewManager: RCTViewManager {
3537
@objc
3638
func present(_ tag: NSNumber, index: Int, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
3739
let trueSheetView = getTrueSheetView(tag)
38-
trueSheetView.present(at: index, promise: Promise(resolver: resolve, rejecter: reject))
40+
trueSheetView?.present(at: index, promise: Promise(resolver: resolve, rejecter: reject))
3941
}
4042

4143
@objc
4244
func dismiss(_ tag: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
4345
let trueSheetView = getTrueSheetView(tag)
44-
trueSheetView.dismiss(promise: Promise(resolver: resolve, rejecter: reject))
46+
trueSheetView?.dismiss(promise: Promise(resolver: resolve, rejecter: reject))
4547
}
4648
}

0 commit comments

Comments
 (0)