fix: android mods

Author: lodev09

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

@@ -25,7 +25,7 @@ class TrueSheetDialog(private val reactContext: ThemedReactContext, private val
 
   var sizes: Array<Any> = arrayOf("medium", "large")
 
-  var sheetView: ViewGroup
+  private var sheetView: ViewGroup
 
   init {
     setContentView(rootSheetView)
@@ -39,6 +39,9 @@ class TrueSheetDialog(private val reactContext: ThemedReactContext, private val
         WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
       )
     }
+
+    // Update the usable sheet height
+    maxScreenHeight = Utils.screenHeight(reactContext)
   }
 
   fun show(sizeIndex: Int) {
@@ -52,6 +55,12 @@ class TrueSheetDialog(private val reactContext: ThemedReactContext, private val
     }
   }
 
+  fun positionFooter() {
+    footerView?.apply {
+      y = (maxScreenHeight - sheetView.top - height).toFloat()
+    }
+  }
+
   /**
    * Set the state based on the given size index.
    */
@@ -102,7 +111,10 @@ class TrueSheetDialog(private val reactContext: ThemedReactContext, private val
         else -> (maxScreenHeight * 0.5).toInt()
       }
 
-    return minOf(height, maxSheetHeight ?: maxScreenHeight)
+    return when (maxSheetHeight) {
+      null -> height
+      else -> minOf(height, maxSheetHeight ?: maxScreenHeight)
+    }
   }
 
   /**
@@ -144,9 +156,7 @@ class TrueSheetDialog(private val reactContext: ThemedReactContext, private val
           else -> Utils.screenHeight(reactContext)
         }
 
-        footerView?.apply {
-          y = (maxScreenHeight - (sheetView.top ?: 0) - height).toFloat()
-        }
+        positionFooter()
       }
     })
   }
@@ -162,9 +172,6 @@ class TrueSheetDialog(private val reactContext: ThemedReactContext, private val
    * Configure the sheet based on size preferences.
    */
   fun configure() {
-    // Update the usable sheet height
-    maxScreenHeight = Utils.screenHeight(reactContext)
-
     var contentHeight = 0
 
     contentView?.let { contentHeight = it.height }
@@ -181,20 +188,20 @@ class TrueSheetDialog(private val reactContext: ThemedReactContext, private val
       when (sizes.size) {
         1 -> {
           maxHeight = getSizeHeight(sizes[0], contentHeight)
-          peekHeight = maxHeight
+          setPeekHeight(maxHeight, isShowing)
           skipCollapsed = true
         }
 
         2 -> {
-          peekHeight = getSizeHeight(sizes[0], contentHeight)
+          setPeekHeight(getSizeHeight(sizes[0], contentHeight), isShowing)
           maxHeight = getSizeHeight(sizes[1], contentHeight)
         }
 
         3 -> {
           // Enables half expanded
           isFitToContents = false
 
-          peekHeight = getSizeHeight(sizes[0], contentHeight)
+          setPeekHeight(getSizeHeight(sizes[0], contentHeight), isShowing)
           halfExpandedRatio = getSizeHeight(sizes[1], contentHeight).toFloat() / maxScreenHeight.toFloat()
           maxHeight = getSizeHeight(sizes[2], contentHeight)
         }

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

@@ -1,7 +1,6 @@
 package com.lodev09.truesheet
 
 import android.content.Context
-import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewStructure
@@ -79,10 +78,8 @@ class TrueSheetView(context: Context) :
         registerKeyboardManager()
 
         // Initialize footer y
-        footerView?.apply {
-          UiThreadUtil.runOnUiThread {
-            y = (sheetDialog.maxScreenHeight - sheetView.top - height).toFloat()
-          }
+        UiThreadUtil.runOnUiThread {
+          positionFooter()
         }
 
         presentPromise?.let { promise ->
@@ -96,8 +93,8 @@ class TrueSheetView(context: Context) :
 
       // Setup listener when the dialog has been dismissed.
       setOnDismissListener {
-        Log.d(TAG, "dismissed")
         unregisterKeyboardManager()
+
         dismissPromise?.let { promise ->
           promise()
           dismissPromise = null
@@ -221,9 +218,18 @@ class TrueSheetView(context: Context) :
     sheetDialog.dismiss()
   }
 
+  private fun configureIfPresented() {
+    if (sheetDialog.isShowing) {
+      UiThreadUtil.runOnUiThread {
+        sheetDialog.configure()
+        sheetDialog.positionFooter()
+      }
+    }
+  }
+
   fun setMaxHeight(height: Int) {
     sheetDialog.maxSheetHeight = height
-    sheetDialog.configure()
+    configureIfPresented()
   }
 
   fun setDismissible(dismissible: Boolean) {
@@ -233,7 +239,7 @@ class TrueSheetView(context: Context) :
 
   fun setSizes(newSizes: Array<Any>) {
     sheetDialog.sizes = newSizes
-    sheetDialog.configure()
+    configureIfPresented()
   }
 
   /**

example/src/sheets/PromptSheet.tsx

@@ -1,11 +1,19 @@
-import React, { forwardRef, useRef, type Ref, useImperativeHandle } from 'react'
+import React, {
+  forwardRef,
+  useRef,
+  type Ref,
+  useImperativeHandle,
+  useState,
+  useEffect,
+} from 'react'
 import { TextInput, View, type TextStyle, type ViewStyle } from 'react-native'
-import { TrueSheet, type TrueSheetProps } from '@lodev09/react-native-true-sheet'
+import { TrueSheet, type SheetSize, type TrueSheetProps } from '@lodev09/react-native-true-sheet'
 
 import {
   BORDER_RADIUS,
   DARK,
   DARK_BLUE,
+  FOOTER_HEIGHT,
   GRABBER_COLOR,
   GRAY,
   INPUT_HEIGHT,
@@ -20,35 +28,58 @@ interface PromptSheetProps extends TrueSheetProps {}
 export const PromptSheet = forwardRef((props: PromptSheetProps, ref: Ref<TrueSheet>) => {
   const sheetRef = useRef<TrueSheet>(null)
 
+  const [contentHeight, setContentHeight] = useState<number>()
+  const [isSubmitted, setIsSubmitted] = useState(false)
+  const [size, setSize] = useState<SheetSize>('auto')
+
+  const handleDismiss = () => {
+    setIsSubmitted(false)
+    setSize('auto')
+    console.log('Sheet prompt dismissed!')
+  }
+
   const dismiss = async () => {
     await sheetRef.current?.dismiss()
     console.log('Sheet prompt dismiss asynced')
   }
 
+  const submit = async () => {
+    setIsSubmitted(true)
+  }
+
   useImperativeHandle<TrueSheet | null, TrueSheet | null>(ref, () => sheetRef.current)
 
+  useEffect(() => {
+    if (isSubmitted && contentHeight) {
+      setSize(contentHeight + FOOTER_HEIGHT)
+    }
+  }, [isSubmitted, contentHeight])
+
   return (
     <TrueSheet
       ref={sheetRef}
       name="prompt-sheet"
-      sizes={['auto', '80%']}
-      dismissible={false}
+      sizes={[size, '80%']}
       contentContainerStyle={$content}
       blurTint="dark"
       backgroundColor={DARK}
       cornerRadius={12}
       grabberProps={{ color: GRABBER_COLOR }}
-      onDismiss={() => console.log('Sheet prompt dismissed!')}
+      onDismiss={handleDismiss}
       onPresent={({ index, value }) =>
         console.log(`Sheet prompt presented with size of ${value} at index: ${index}`)
       }
       onSizeChange={({ index, value }) => console.log(`Resized to:`, value, 'at index:', index)}
       FooterComponent={<Footer />}
       {...props}
     >
-      <DemoContent color={DARK_BLUE} text={random(RANDOM_TEXTS)} />
-      <Input />
-      <Button text="Dismis" onPress={dismiss} />
+      <View onLayout={(e) => isSubmitted && setContentHeight(e.nativeEvent.layout.height)}>
+        <DemoContent color={DARK_BLUE} text={random(RANDOM_TEXTS)} />
+        <Input />
+        {isSubmitted && <Input />}
+        <Button text="Submit" onPress={submit} />
+        <Button text="Dismis" onPress={dismiss} />
+      </View>
     </TrueSheet>
   )
 })
@@ -73,7 +104,7 @@ const $inputContainer: ViewStyle = {
   height: INPUT_HEIGHT,
   borderRadius: BORDER_RADIUS,
   justifyContent: 'center',
-  marginBottom: SPACING * 2,
+  marginBottom: SPACING,
 }
 
 const $input: TextStyle = {