From 54ebc4036e6377db00a702ff85de0b2291026b4c Mon Sep 17 00:00:00 2001
From: Hailey <me@haileyok.com>
Date: Thu, 3 Oct 2024 08:54:06 -0700
Subject: [PATCH] tweak

---
 modules/bottom-sheet/android/build.gradle     |  1 +
 .../expo/modules/bottomsheet/SheetView.kt     | 79 +++++++++++++------
 2 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/modules/bottom-sheet/android/build.gradle b/modules/bottom-sheet/android/build.gradle
index 555d34ed1f..a685376092 100644
--- a/modules/bottom-sheet/android/build.gradle
+++ b/modules/bottom-sheet/android/build.gradle
@@ -53,4 +53,5 @@ dependencies {
   implementation "androidx.compose.material3:material3:1.3.0"
   implementation "androidx.compose.material:material:1.7.2"
   implementation "com.facebook.react:react-native:+"
+  implementation("com.composables:core:1.12.0")
 }
diff --git a/modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/SheetView.kt b/modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/SheetView.kt
index cf12597590..183dada50e 100644
--- a/modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/SheetView.kt
+++ b/modules/bottom-sheet/android/src/main/java/expo/modules/bottomsheet/SheetView.kt
@@ -1,22 +1,37 @@
 package expo.modules.bottomsheet
 
+import android.util.Log
 import android.view.View
+import androidx.compose.foundation.background
+import androidx.compose.foundation.gestures.scrollable
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.SheetValue
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
+import com.composables.core.BottomSheet
+import com.composables.core.SheetDetent
+import com.composables.core.SheetDetent.Companion.FullyExpanded
+import com.composables.core.SheetDetent.Companion.Hidden
+import com.composables.core.rememberBottomSheetState
+import kotlinx.coroutines.launch
+import kotlin.annotations.jvm.Mutable
 
 data class SheetState(
   var isOpen: Boolean = false,
@@ -29,41 +44,57 @@ data class SheetState(
 @Composable
 fun SheetView(
   state: MutableState<SheetState>,
+  openState: MutableState<Boolean>,
   innerView: View,
   contentHeight: Float,
   onDismissRequest: () -> Unit,
   onExpanded: () -> Unit,
   onHidden: () -> Unit,
 ) {
-  val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = false)
+  val Peek = SheetDetent(identifier = "peek") { containerHeight, sheetHeight ->
+    containerHeight*0.6f
+  }
 
-  ModalBottomSheet(
-    sheetState = sheetState,
-    onDismissRequest = onDismissRequest,
-    shape =
-      RoundedCornerShape(
-        topStart = state.value.cornerRadius ?: 0f,
-        topEnd = state.value.cornerRadius ?: 0f,
-      ),
-    containerColor = Color(state.value.containerBackgroundColor ?: android.graphics.Color.TRANSPARENT),
+  val scope = rememberCoroutineScope()
+
+  val sheetState = rememberBottomSheetState(
+    initialDetent = Hidden,
+    detents = listOf(Hidden, Peek, FullyExpanded)
+  )
+
+  BottomSheet(
+    state = sheetState,
+    modifier = Modifier.fillMaxWidth()
+      .shadow(4.dp)
+      .clip(RoundedCornerShape(topStart = state.value.cornerRadius ?: 0f, topEnd = state.value.cornerRadius ?: 0f))
+      .background(Color(state.value.containerBackgroundColor ?: android.graphics.Color.TRANSPARENT))
+      .imePadding()
+//    onDismissRequest = onDismissRequest,
+//    shape =
+//      RoundedCornerShape(
+//        topStart = state.value.cornerRadius ?: 0f,
+//        topEnd = state.value.cornerRadius ?: 0f,
+//      ),
+//    containerColor = Color(state.value.containerBackgroundColor ?: android.graphics.Color.TRANSPARENT),
   ) {
-    Column(
-      Modifier
-        .fillMaxWidth()
-        .height(contentHeight.dp)
-        // Prevent covering up the handle
-        .padding(top = 34.dp),
-    ) {
-      AndroidView(
-        factory = { innerView },
-      )
+    AndroidView(
+      factory = { innerView },
+    )
+  }
+
+  LaunchedEffect(openState) {
+    Log.d("SheetView", "openState: ${openState.value}")
+    if (openState.value) {
+      sheetState.currentDetent = Peek
+    } else {
+      sheetState.currentDetent = Hidden
     }
   }
 
-  LaunchedEffect(sheetState.currentValue) {
-    if (sheetState.currentValue == SheetValue.PartiallyExpanded || sheetState.currentValue == SheetValue.Expanded) {
+  LaunchedEffect(sheetState.currentDetent) {
+    if (sheetState.currentDetent == Peek || sheetState.currentDetent == FullyExpanded) {
       onExpanded()
-    } else if (sheetState.currentValue == SheetValue.Hidden) {
+    } else if (sheetState.currentDetent == Hidden) {
       onHidden()
     }
   }