@lodev09/react-native-true-sheet 3.7.0-beta.4 → 3.7.0

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

@@ -39,10 +39,6 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   // ==================== Properties ====================
 
   internal val viewController: TrueSheetViewController = TrueSheetViewController(reactContext)
-
-  private val containerView: TrueSheetContainerView?
-    get() = viewController.getChildAt(0) as? TrueSheetContainerView
-
   override var eventDispatcher: EventDispatcher? = null
 
   // Initial present configuration (set by ViewManager before mount)
@@ -81,10 +77,6 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
 
   // ==================== ReactViewGroup Overrides ====================
 
-  override fun dispatchProvideStructure(structure: ViewStructure) {
-    super.dispatchProvideStructure(structure)
-  }
-
   override fun onLayout(
     changed: Boolean,
     left: Int,
@@ -277,10 +269,12 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   @UiThread
   fun present(detentIndex: Int, animated: Boolean = true, promiseCallback: () -> Unit) {
     if (!viewController.isPresented) {
-      // Only dismiss keyboard if the focused view is within a parent sheet (iOS-like behavior)
+      // Dismiss keyboard if focused view is within a sheet or if target detent will be dimmed
       val parentSheet = TrueSheetStackManager.getTopmostSheet()
-      if (KeyboardUtils.isKeyboardVisible(reactContext) && parentSheet?.viewController?.isFocusedViewWithinSheet() == true) {
-        parentSheet.viewController.saveFocusedView()
+      val isFocusedViewWithinSheet = parentSheet?.viewController?.isFocusedViewWithinSheet() == true
+      val shouldDismissKeyboard = isFocusedViewWithinSheet || viewController.isDimmedAtDetentIndex(detentIndex)
+      if (KeyboardUtils.isKeyboardVisible(reactContext) && shouldDismissKeyboard) {
+        viewController.saveFocusedView()
         KeyboardUtils.dismiss(this) {
           post { present(detentIndex, animated, promiseCallback) }
         }

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

@@ -205,9 +205,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       if (isPresented) sheetView?.setupGrabber()
     }
 
-  val isDimmedAtCurrentDetent: Boolean
-    get() = dimmed && currentDetentIndex >= dimmedDetentIndex
-
   // =============================================================================
   // MARK: - Computed Properties
   // =============================================================================
@@ -288,6 +285,11 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   private val dimViews: List<TrueSheetDimView>
     get() = listOfNotNull(dimView, parentDimView)
 
+  val isDimmedAtCurrentDetent: Boolean
+    get() = isDimmedAtDetentIndex(currentDetentIndex)
+
+  fun isDimmedAtDetentIndex(index: Int): Boolean = dimmed && index >= dimmedDetentIndex
+
   // =============================================================================
   // MARK: - Sheet Creation & Cleanup
   // =============================================================================
@@ -713,7 +715,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   }
 
   private fun finishDismiss() {
-    parentSheetView?.viewController?.restoreFocusedView()
+    restoreFocusedView()
     emitDidDismissEvents()
     cleanupSheet()
   }

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

@@ -1,5 +1,6 @@
 package com.lodev09.truesheet.core
 
+import android.view.ViewGroup
 import com.lodev09.truesheet.TrueSheetView
 
 /**
@@ -10,6 +11,25 @@ object TrueSheetStackManager {
 
   private val presentedSheetStack = mutableListOf<TrueSheetView>()
 
+  /**
+   * Gets the parent sheet at the given index, if any.
+   * Only returns a parent if it's in the same container.
+   * Must be called within synchronized block.
+   */
+  private fun getParentSheetAt(index: Int, rootContainer: ViewGroup?): TrueSheetView? {
+    if (index <= 0) return null
+    return presentedSheetStack[index - 1].takeIf { it.rootContainerView == rootContainer }
+  }
+
+  /**
+   * 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
+    }
+
   /**
    * Called when a sheet is about to be presented.
    * Returns the visible parent sheet to stack on, or null if none.
@@ -18,13 +38,7 @@ object TrueSheetStackManager {
   @JvmStatic
   fun onSheetWillPresent(sheetView: TrueSheetView, detentIndex: Int): TrueSheetView? {
     synchronized(presentedSheetStack) {
-      val rootContainer = sheetView.rootContainerView
-      val parentSheet = presentedSheetStack.lastOrNull()
-        ?.takeIf {
-          it.viewController.isPresented &&
-            it.viewController.isSheetVisible &&
-            it.rootContainerView == rootContainer
-        }
+      val parentSheet = findTopmostSheet()?.takeIf { it.rootContainerView == sheetView.rootContainerView }
 
       val childSheetTop = sheetView.viewController.detentCalculator.getSheetTopForDetentIndex(detentIndex)
       parentSheet?.updateTranslationForChild(childSheetTop)
@@ -60,11 +74,7 @@ object TrueSheetStackManager {
   fun onSheetSizeChanged(sheetView: TrueSheetView) {
     synchronized(presentedSheetStack) {
       val index = presentedSheetStack.indexOf(sheetView)
-      if (index <= 0) return
-
-      val rootContainer = sheetView.rootContainerView
-      val parentSheet = presentedSheetStack[index - 1]
-        .takeIf { it.rootContainerView == rootContainer } ?: return
+      val parentSheet = getParentSheetAt(index, sheetView.rootContainerView) ?: return
 
       // Post to ensure layout is complete before reading position
       sheetView.viewController.post {
@@ -117,9 +127,7 @@ object TrueSheetStackManager {
   fun getParentSheet(sheetView: TrueSheetView): TrueSheetView? {
     synchronized(presentedSheetStack) {
       val index = presentedSheetStack.indexOf(sheetView)
-      if (index <= 0) return null
-      val rootContainer = sheetView.rootContainerView
-      return presentedSheetStack[index - 1].takeIf { it.rootContainerView == rootContainer }
+      return getParentSheetAt(index, sheetView.rootContainerView)
     }
   }
 
@@ -140,7 +148,7 @@ object TrueSheetStackManager {
   @JvmStatic
   fun getTopmostSheet(): TrueSheetView? {
     synchronized(presentedSheetStack) {
-      return presentedSheetStack.lastOrNull { it.viewController.isPresented && it.viewController.isSheetVisible }
+      return findTopmostSheet()
     }
   }
 }

package/package.json

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