@lodev09/react-native-true-sheet 3.7.1 → 3.7.2

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

@@ -3,7 +3,6 @@ package com.lodev09.truesheet
 import android.annotation.SuppressLint
 import android.view.View
 import android.view.ViewGroup
-import android.view.ViewStructure
 import android.view.accessibility.AccessibilityEvent
 import androidx.annotation.UiThread
 import com.facebook.react.bridge.LifecycleEventListener
@@ -32,10 +31,6 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   TrueSheetViewControllerDelegate,
   TrueSheetContainerViewDelegate {
 
-  companion object {
-    const val TAG_NAME = "TrueSheet"
-  }
-
   // ==================== Properties ====================
 
   internal val viewController: TrueSheetViewController = TrueSheetViewController(reactContext)
@@ -200,7 +195,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     if (viewController.dimmed == dimmed) return
     viewController.dimmed = dimmed
     if (viewController.isPresented) {
-      viewController.setupDimmedBackground(viewController.currentDetentIndex)
+      viewController.setupDimmedBackground()
       viewController.updateDimAmount()
     }
   }
@@ -209,7 +204,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     if (viewController.dimmedDetentIndex == index) return
     viewController.dimmedDetentIndex = index
     if (viewController.isPresented) {
-      viewController.setupDimmedBackground(viewController.currentDetentIndex)
+      viewController.setupDimmedBackground()
       viewController.updateDimAmount()
     }
   }
@@ -492,6 +487,10 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     dismissAll(animated = true) {}
   }
 
+  override fun viewControllerDidDetectScreenDismiss() {
+    resetTranslation()
+  }
+
   // ==================== TrueSheetContainerViewDelegate ====================
 
   override fun containerViewContentDidChangeSize(width: Int, height: Int) {

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

@@ -1,7 +1,6 @@
 package com.lodev09.truesheet
 
 import android.annotation.SuppressLint
-import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.os.Build
 import android.view.MotionEvent
@@ -11,10 +10,8 @@ import android.view.accessibility.AccessibilityNodeInfo
 import android.widget.ImageView
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
-import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.graphics.createBitmap
 import androidx.core.view.isNotEmpty
-import androidx.core.view.isVisible
 import com.facebook.react.R
 import com.facebook.react.uimanager.JSPointerDispatcher
 import com.facebook.react.uimanager.JSTouchDispatcher
@@ -67,6 +64,7 @@ interface TrueSheetViewControllerDelegate {
   fun viewControllerDidBlur()
   fun viewControllerDidBackPress()
   fun viewControllerDidDetectScreenDisappear()
+  fun viewControllerDidDetectScreenDismiss()
 }
 
 // =============================================================================
@@ -90,8 +88,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   TrueSheetBottomSheetViewDelegate {
 
   companion object {
-    const val TAG_NAME = "TrueSheet"
-
     private const val DEFAULT_MAX_WIDTH = 640 // dp
     private const val DEFAULT_CORNER_RADIUS = 16 // dp
     private const val TRANSLATE_ANIMATION_DURATION = 200L
@@ -234,11 +230,15 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     get() = ScreenUtils.getRealScreenHeight(reactContext)
 
   // Content Measurements
+  // Cached values used during dismiss when container is unmounted
+  private var cachedContentHeight: Int = 0
+  private var cachedHeaderHeight: Int = 0
+
   override val contentHeight: Int
-    get() = containerView?.contentHeight ?: 0
+    get() = containerView?.contentHeight ?: cachedContentHeight
 
   override val headerHeight: Int
-    get() = containerView?.headerHeight ?: 0
+    get() = containerView?.headerHeight ?: cachedHeaderHeight
 
   // Insets
   // Target keyboard height used for detent calculations
@@ -266,9 +266,10 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   override val contentBottomInset: Int
     get() = if (insetAdjustment == "automatic") bottomInset else 0
 
+  @Suppress("KotlinConstantConditions", "SimplifyBooleanWithConstants")
   private val edgeToEdgeEnabled: Boolean
     get() {
-      val defaultEnabled = android.os.Build.VERSION.SDK_INT >= 36
+      val defaultEnabled = Build.VERSION.SDK_INT >= 36
       return BuildConfig.EDGE_TO_EDGE_ENABLED || defaultEnabled
     }
 
@@ -340,6 +341,8 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     isPresented = false
     isSheetVisible = false
     wasHiddenByModal = false
+    cachedContentHeight = 0
+    cachedHeaderHeight = 0
     isPresentAnimating = false
     lastEmittedPositionPx = -1
     detentIndexBeforeKeyboard = -1
@@ -539,7 +542,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
         if (detentInfo.index != currentDetentIndex) {
           currentDetentIndex = detentInfo.index
-          setupDimmedBackground(detentInfo.index)
+          setupDimmedBackground()
           delegate?.viewControllerDidChangeDetent(detentInfo.index, detentInfo.position, detent)
         }
 
@@ -574,6 +577,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       onModalWillDismiss = {
         if (isPresented && wasHiddenByModal && isTopmostSheet) {
           showAfterModal()
+          delegate?.viewControllerDidDetectScreenDismiss()
         }
       },
       onModalDidDismiss = {
@@ -659,7 +663,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     }
 
     if (isPresented) {
-      setupDimmedBackground(detentIndex)
+      setupDimmedBackground()
       setStateForDetentIndex(detentIndex)
     } else {
       shouldAnimatePresent = animated
@@ -672,7 +676,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       emitWillPresentEvents()
 
       setupSheetDetents()
-      setupDimmedBackground(currentDetentIndex)
+      setupDimmedBackground()
       setupKeyboardObserver()
       setupModalObserver()
       setupBackCallback()
@@ -703,6 +707,8 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
     // Create layout params with behavior
     val params = sheet.createLayoutParams()
+
+    @Suppress("UNCHECKED_CAST")
     val behavior = params.behavior as BottomSheetBehavior<TrueSheetBottomSheetView>
 
     // Configure behavior
@@ -786,6 +792,11 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       return
     }
 
+    containerView?.let {
+      cachedContentHeight = it.contentHeight
+      cachedHeaderHeight = it.headerHeight
+    }
+
     interactionState = InteractionState.Reconfiguring
 
     behavior.isFitToContents = false
@@ -857,7 +868,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   // MARK: - Dimmed Background
   // =============================================================================
 
-  fun setupDimmedBackground(detentIndex: Int) {
+  fun setupDimmedBackground() {
     val coordinator = this.coordinatorLayout ?: run {
       RNLog.e(reactContext, "TrueSheet: coordinatorLayout is null in setupDimmedBackground")
       return
@@ -896,6 +907,8 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
   fun updateDimAmount(sheetTop: Int? = null, animated: Boolean = false) {
     if (!dimmed) return
+    if (contentHeight == 0) return
+
     val keyboardOffset = if (isDismissing) 0 else currentKeyboardInset
     val top = (sheetTop ?: sheetView?.top ?: return) + keyboardOffset
 

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

@@ -18,16 +18,16 @@ object TrueSheetStackManager {
    */
   private fun getParentSheetAt(index: Int, rootContainer: ViewGroup?): TrueSheetView? {
     if (index <= 0) return null
-    return presentedSheetStack[index - 1].takeIf { !it.viewController.wasHiddenByModal && it.rootContainerView == rootContainer }
+    return presentedSheetStack[index - 1].takeIf { it.rootContainerView == rootContainer }
   }
 
   /**
-   * Returns the topmost presented and visible sheet that is not hidden by modal.
+   * Returns the topmost presented and visible sheet.
    * Must be called within synchronized block.
    */
   private fun findTopmostSheet(): TrueSheetView? =
     presentedSheetStack.lastOrNull {
-      it.viewController.isPresented && it.viewController.isSheetVisible && !it.viewController.wasHiddenByModal
+      it.viewController.isPresented && it.viewController.isSheetVisible
     }
 
   /**

package/package.json

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