Skip to content

Commit bcd0b17

Browse files
authored
fix(ios): add null guard (#52)
1 parent 329026d commit bcd0b17

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

android/src/main/java/com/lodev09/truesheet/TrueSheetView.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,13 +172,13 @@ class TrueSheetView(context: Context) :
172172
// Initialize content
173173
UiThreadUtil.runOnUiThread {
174174
// 1st child is the content view
175-
val contentView = it.getChildAt(0) as ViewGroup
176-
setContentHeight(contentView.height)
175+
val contentView = it.getChildAt(0) as ViewGroup?
176+
setContentHeight(contentView?.height ?: 0)
177177

178178
// 2nd child is the footer view
179-
val footerView = it.getChildAt(1) as ViewGroup
179+
val footerView = it.getChildAt(1) as ViewGroup?
180180
sheetDialog.footerView = footerView
181-
setFooterHeight(footerView.height)
181+
setFooterHeight(footerView?.height ?: 0)
182182

183183
if (initialIndex >= 0) {
184184
currentSizeIndex = initialIndex

ios/TrueSheetView.swift

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ class TrueSheetView: UIView, RCTInvalidating, TrueSheetViewControllerDelegate {
4545

4646
private var rctScrollView: RCTScrollView?
4747

48+
private var uiManager: RCTUIManager? {
49+
guard let uiManager = bridge?.uiManager else { return nil }
50+
return uiManager
51+
}
52+
4853
// MARK: - Setup
4954

5055
init(with bridge: RCTBridge) {
@@ -143,7 +148,7 @@ class TrueSheetView: UIView, RCTInvalidating, TrueSheetViewControllerDelegate {
143148
guard let containerView else { return }
144149

145150
let size = CGSize(width: width, height: containerView.bounds.height)
146-
bridge?.uiManager.setSize(size, for: containerView)
151+
uiManager?.setSize(size, for: containerView)
147152
}
148153

149154
func viewControllerWillAppear() {
@@ -297,7 +302,7 @@ class TrueSheetView: UIView, RCTInvalidating, TrueSheetViewControllerDelegate {
297302

298303
@objc
299304
func setScrollableHandle(_ tag: NSNumber?) {
300-
let view = bridge?.uiManager.view(forReactTag: tag) as? RCTScrollView
305+
let view = uiManager?.view(forReactTag: tag) as? RCTScrollView
301306
rctScrollView = view
302307
}
303308

0 commit comments

Comments
 (0)