@lodev09/react-native-true-sheet 2.0.0 → 2.0.1

package/android/src/main/java/com/lodev09/truesheet/TrueSheetDialog.kt

@@ -24,11 +24,15 @@ class TrueSheetDialog(private val reactContext: ThemedReactContext, private val
   private var windowAnimation: Int = 0
 
   // First child of the rootSheetView
-  private val containerView: ViewGroup
-    get() = rootSheetView.getChildAt(0) as ViewGroup
+  private val containerView: ViewGroup?
+    get() = if (rootSheetView.childCount > 0) {
+      rootSheetView.getChildAt(0) as? ViewGroup
+    } else {
+      null
+    }
 
-  private val sheetContainerView: ViewGroup
-    get() = rootSheetView.parent as ViewGroup
+  private val sheetContainerView: ViewGroup?
+    get() = rootSheetView.parent?.let { it as? ViewGroup }
 
   /**
    * Specify whether the sheet background is dimmed.
@@ -70,20 +74,20 @@ class TrueSheetDialog(private val reactContext: ThemedReactContext, private val
   var backgroundColor: Int = Color.WHITE
 
   // 1st child is the content view
-  val contentView: ViewGroup
-    get() = containerView.getChildAt(0) as ViewGroup
+  val contentView: ViewGroup?
+    get() = containerView?.getChildAt(0) as? ViewGroup
 
   // 2nd child is the footer view
-  val footerView: ViewGroup
-    get() = containerView.getChildAt(1) as ViewGroup
+  val footerView: ViewGroup?
+    get() = containerView?.getChildAt(1) as? ViewGroup
 
   var sizes: Array<Any> = arrayOf("medium", "large")
 
   init {
     setContentView(rootSheetView)
 
-    sheetContainerView.setBackgroundColor(backgroundColor)
-    sheetContainerView.clipToOutline = true
+    sheetContainerView?.setBackgroundColor(backgroundColor)
+    sheetContainerView?.clipToOutline = true
 
     // Setup window params to adjust layout based on Keyboard state
     window?.apply {
@@ -131,7 +135,7 @@ class TrueSheetDialog(private val reactContext: ThemedReactContext, private val
 
     // Use current background color
     background.paint.color = backgroundColor
-    sheetContainerView.background = background
+    sheetContainerView?.background = background
   }
 
   /**
@@ -196,8 +200,10 @@ class TrueSheetDialog(private val reactContext: ThemedReactContext, private val
   }
 
   fun positionFooter() {
-    footerView.apply {
-      y = (maxScreenHeight - sheetContainerView.top - footerHeight).toFloat()
+    footerView?.let { footer ->
+      sheetContainerView?.let { container ->
+        footer.y = (maxScreenHeight - container.top - footerHeight).toFloat()
+      }
     }
   }
 

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

@@ -178,8 +178,8 @@ class TrueSheetView(context: Context) :
 
     // Initialize content
     UiThreadUtil.runOnUiThread {
-      setContentHeight(sheetDialog.contentView.height)
-      setFooterHeight(sheetDialog.footerView.height)
+      sheetDialog.contentView?.height?.let { setContentHeight(it) }
+      sheetDialog.footerView?.height?.let { setFooterHeight(it) }
 
       if (initialIndex >= 0) {
         currentSizeIndex = initialIndex

package/android/src/main/java/com/lodev09/truesheet/core/RootSheetView.kt

@@ -86,7 +86,7 @@ class RootSheetView(private val context: Context?) :
   }
 
   @Deprecated("Deprecated in Java")
-  override fun onChildStartedNativeGesture(ev: MotionEvent?) {
+  override fun onChildStartedNativeGesture(ev: MotionEvent) {
     eventDispatcher?.let {
       if (ev != null) {
         jSTouchDispatcher.onChildStartedNativeGesture(ev, it)
@@ -94,7 +94,7 @@ class RootSheetView(private val context: Context?) :
     }
   }
 
-  override fun onChildStartedNativeGesture(childView: View, ev: MotionEvent) {
+  override fun onChildStartedNativeGesture(childView: View?, ev: MotionEvent) {
     eventDispatcher?.let { jSTouchDispatcher.onChildStartedNativeGesture(ev, it) }
     jSPointerDispatcher?.onChildStartedNativeGesture(childView, ev, eventDispatcher)
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lodev09/react-native-true-sheet",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "The true native bottom sheet experience for your React Native Apps.",
   "source": "./src/index.ts",
   "main": "./lib/commonjs/index.js",