@lodev09/react-native-true-sheet 2.0.5 → 2.0.6

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

@@ -210,7 +210,7 @@ class TrueSheetDialog(private val reactContext: ThemedReactContext, private val
   /**
    * Set the state based for the given size index.
    */
-  private fun setStateForSizeIndex(index: Int) {
+  fun setStateForSizeIndex(index: Int) {
     behavior.state = getStateForSizeIndex(index)
   }
 
@@ -263,9 +263,11 @@ class TrueSheetDialog(private val reactContext: ThemedReactContext, private val
   /**
    * Determines the state based from the given size index.
    */
-  private fun getStateForSizeIndex(index: Int) =
-    when (sizes.size) {
-      1 -> BottomSheetBehavior.STATE_EXPANDED
+  private fun getStateForSizeIndex(index: Int): Int {
+    return when (sizes.size) {
+      1 -> {
+        return BottomSheetBehavior.STATE_EXPANDED
+      }
 
       2 -> {
         when (index) {
@@ -286,6 +288,7 @@ class TrueSheetDialog(private val reactContext: ThemedReactContext, private val
 
       else -> BottomSheetBehavior.STATE_HIDDEN
     }
+  }
 
   /**
    * Handle keyboard state changes and adjust maxScreenHeight (sheet max height) accordingly.
@@ -331,6 +334,15 @@ class TrueSheetDialog(private val reactContext: ThemedReactContext, private val
         1 -> {
           maxHeight = getSizeHeight(sizes[0])
           skipCollapsed = true
+
+          if (sizes[0] == "auto") {
+            // Force a layout update
+            sheetContainerView?.let {
+              val params = it.layoutParams
+              params.height = maxHeight
+              it.layoutParams = params
+            }
+          }
         }
 
         2 -> {
@@ -358,6 +370,7 @@ class TrueSheetDialog(private val reactContext: ThemedReactContext, private val
     when (sizes.size) {
       1 -> {
         when (state) {
+          BottomSheetBehavior.STATE_COLLAPSED -> SizeInfo(0, Utils.toDIP(behavior.maxHeight.toFloat()))
           BottomSheetBehavior.STATE_EXPANDED -> SizeInfo(0, Utils.toDIP(behavior.maxHeight.toFloat()))
           else -> null
         }

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

@@ -324,7 +324,11 @@ class TrueSheetView(context: Context) :
   fun configureIfShowing() {
     if (sheetDialog.isShowing) {
       sheetDialog.configure()
-      sheetDialog.positionFooter()
+      sheetDialog.setStateForSizeIndex(currentSizeIndex)
+
+      UiThreadUtil.runOnUiThread {
+        sheetDialog.positionFooter()
+      }
     }
   }
 

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

@@ -109,7 +109,7 @@ class TrueSheetViewManager : ViewGroupManager<TrueSheetView>() {
 
   @ReactProp(name = "background")
   fun setBackground(view: TrueSheetView, colorName: Double) {
-    val color = runCatching { ColorPropConverter.getColor(colorName, view.context) }.getOrDefault(Color.WHITE)
+    val color = runCatching { ColorPropConverter.getColor(colorName, view.context) }.getOrNull() ?: Color.WHITE
     view.setBackground(color)
   }
 

package/ios/TrueSheetView.swift

@@ -433,11 +433,17 @@ class TrueSheetView: UIView, RCTInvalidating, TrueSheetViewControllerDelegate {
     }
 
     if isPresented {
-      withPresentedSheet { sheet in
-        sheet.selectedDetentIdentifier = viewController.detentIdentifierForIndex(index)
+      if #available(iOS 15.0, *) {
+        withPresentedSheet { sheet in
+          sheet.selectedDetentIdentifier = viewController.detentIdentifierForIndex(index)
 
+          // Trigger onSizeChange event when size is changed while presenting
+          viewControllerDidChangeSize(self.viewController.currentSizeInfo)
+          promise?.resolve(nil)
+        }
+      } else {
         // Trigger onSizeChange event when size is changed while presenting
-        viewControllerDidChangeSize(self.viewController.currentSizeInfo)
+        viewControllerDidChangeSize(viewController.currentSizeInfo)
         promise?.resolve(nil)
       }
     } else {

package/package.json

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