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

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

@@ -479,9 +479,9 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
    * Resets this sheet's translation and restores dragging when it becomes topmost.
    * Parent recalculates its translation based on this sheet's position.
    */
-  fun resetTranslation() {
+  fun resetTranslation(onTranslateEnd: (() -> Unit)? = null) {
     viewController.sheetView?.behavior?.isDraggable = viewController.draggable
-    viewController.translateSheet(0)
+    viewController.translateSheet(0, onEnd = onTranslateEnd)
 
     // Parent should recalculate its translation based on this sheet's position
     val mySheetTop = viewController.detentCalculator.getSheetTopForDetentIndex(viewController.currentDetentIndex)
@@ -510,7 +510,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     eventDispatcher?.dispatchEvent(WillDismissEvent(surfaceId, id))
   }
 
-  override fun viewControllerDidDismiss(hadParent: Boolean) {
+  override fun viewControllerDidDismiss(parent: TrueSheetView?) {
     // Detach coordinator from the root container view
     viewController.coordinatorLayout?.let { rootContainerView?.removeView(it) }
     rootContainerView = null
@@ -520,7 +520,14 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     val surfaceId = UIManagerHelper.getSurfaceId(this)
     eventDispatcher?.dispatchEvent(DidDismissEvent(surfaceId, id))
 
-    TrueSheetStackManager.unregisterSheet(this, hadParent)
+    TrueSheetStackManager.unregisterSheet(this)
+
+    parent?.resetTranslation {
+      val parentController = parent.viewController
+      if (parentController.isPresented && !parentController.isBeingDismissed) {
+        parent.viewControllerDidFocus()
+      }
+    }
   }
 
   override fun viewControllerDidChangeDetent(index: Int, position: Float, detent: Float) {

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

@@ -50,7 +50,7 @@ interface TrueSheetViewControllerDelegate {
   fun viewControllerWillPresent(index: Int, position: Float, detent: Float)
   fun viewControllerDidPresent(index: Int, position: Float, detent: Float)
   fun viewControllerWillDismiss()
-  fun viewControllerDidDismiss(hadParent: Boolean)
+  fun viewControllerDidDismiss(parent: TrueSheetView?)
   fun viewControllerDidChangeDetent(index: Int, position: Float, detent: Float)
   fun viewControllerDidDragBegin(index: Int, position: Float, detent: Float)
   fun viewControllerDidDragChange(index: Int, position: Float, detent: Float)
@@ -757,6 +757,11 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   private fun dismissKeyboard() {
     isKeyboardDismissProgrammatic = true
     KeyboardUtils.dismiss(reactContext)
+
+    // Clear focus from any focused view within the sheet to prevent
+    // Android from autofocusing the next focusable view on the main
+    // screen when the sheet is removed from the hierarchy.
+    sheetView?.findFocus()?.clearFocus()
   }
 
   fun handleBackPress() {
@@ -1158,12 +1163,11 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   }
 
   private fun emitDidDismissEvents() {
-    val hadParent = parentSheetView != null
-    parentSheetView?.viewControllerDidFocus()
+    val parent = parentSheetView
     parentSheetView = null
 
     delegate?.viewControllerDidBlur()
-    delegate?.viewControllerDidDismiss(hadParent)
+    delegate?.viewControllerDidDismiss(parent)
 
     dismissPromise?.invoke()
     dismissPromise = null
@@ -1219,7 +1223,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     }
   }
 
-  fun translateSheet(translationY: Int) {
+  fun translateSheet(translationY: Int, onEnd: (() -> Unit)? = null) {
     val sheet = sheetView ?: return
 
     sheet.animate()
@@ -1229,6 +1233,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
         val effectiveTop = sheet.top + sheet.translationY.toInt()
         emitChangePositionDelegate(effectiveTop)
       }
+      .withEndAction { onEnd?.invoke() }
       .start()
   }
 

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

@@ -48,15 +48,12 @@ object TrueSheetStackManager {
   }
 
   /**
-   * Unregisters a sheet from the stack and resets parent translation if needed.
+   * Unregisters a sheet from the stack.
    */
   @JvmStatic
-  fun unregisterSheet(sheetView: TrueSheetView, hadParent: Boolean) {
+  fun unregisterSheet(sheetView: TrueSheetView) {
     synchronized(presentedSheetStack) {
       presentedSheetStack.remove(sheetView)
-      if (hadParent) {
-        presentedSheetStack.lastOrNull()?.resetTranslation()
-      }
     }
   }
 

package/package.json

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