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

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

@@ -127,6 +127,9 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   private var windowAnimation: Int = 0
   private var lastEmittedPositionPx: Int = -1
 
+  /** Tracks if this sheet was hidden due to a RN Screens modal (vs sheet stacking) */
+  private var wasHiddenByModal = false
+
   var presentPromise: (() -> Unit)? = null
   var dismissPromise: (() -> Unit)? = null
 
@@ -265,6 +268,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     isDismissing = false
     isPresented = false
     isDialogVisible = false
+    wasHiddenByModal = false
     lastEmittedPositionPx = -1
   }
 
@@ -381,13 +385,16 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     rnScreensObserver = RNScreensFragmentObserver(
       reactContext = reactContext,
       onModalPresented = {
-        if (isPresented) {
-          hideDialog()
+        if (isPresented && isDialogVisible) {
+          hideDialog(animated = true)
+          wasHiddenByModal = true
         }
       },
       onModalDismissed = {
-        if (isPresented) {
-          showDialog()
+        // Only show if we were the one hidden by modal, not by sheet stacking
+        if (isPresented && wasHiddenByModal) {
+          showDialog(animated = true)
+          wasHiddenByModal = false
         }
       }
     )
@@ -437,8 +444,11 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   }
 
   /** Hides without dismissing. Used for sheet stacking and RN Screens modals. */
-  fun hideDialog(emitPosition: Boolean = false) {
+  fun hideDialog(emitPosition: Boolean = false, animated: Boolean = false) {
     isDialogVisible = false
+    if (animated) {
+      dialog?.window?.setWindowAnimations(com.lodev09.truesheet.R.style.TrueSheetFadeAnimation)
+    }
     dialog?.window?.decorView?.visibility = INVISIBLE
     if (emitPosition) {
       emitDismissedPosition()
@@ -446,12 +456,18 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   }
 
   /** Shows a previously hidden dialog. */
-  fun showDialog(emitPosition: Boolean = false) {
+  fun showDialog(emitPosition: Boolean = false, animated: Boolean = false) {
     isDialogVisible = true
     dialog?.window?.decorView?.visibility = VISIBLE
     if (emitPosition) {
       bottomSheetView?.let { emitChangePositionDelegate(it, realtime = false) }
     }
+    if (animated) {
+      // Restore original animation after fade-in completes (100ms)
+      sheetContainer?.postDelayed({
+        dialog?.window?.setWindowAnimations(windowAnimation)
+      }, 100)
+    }
   }
 
   // ====================================================================

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

@@ -27,8 +27,8 @@ class RNScreensFragmentObserver(
     val fragmentManager = activity.supportFragmentManager
 
     fragmentLifecycleCallback = object : FragmentManager.FragmentLifecycleCallbacks() {
-      override fun onFragmentStarted(fm: FragmentManager, fragment: Fragment) {
-        super.onFragmentStarted(fm, fragment)
+      override fun onFragmentPreAttached(fm: FragmentManager, fragment: Fragment, context: android.content.Context) {
+        super.onFragmentPreAttached(fm, fragment, context)
 
         if (isModalFragment(fragment) && !activeModalFragments.contains(fragment)) {
           activeModalFragments.add(fragment)

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

@@ -20,12 +20,15 @@ object TrueSheetDialogObserver {
       val parentSheet = presentedSheetStack.lastOrNull()
         ?.takeIf { it.viewController.isPresented && it.viewController.isDialogVisible }
 
-      // Hide parent if the new sheet would cover it
-      parentSheet?.let {
-        val parentTop = it.viewController.currentSheetTop
-        val newSheetTop = sheetView.viewController.getExpectedSheetTop(detentIndex)
-        if (!it.viewController.isExpanded && parentTop <= newSheetTop) {
-          it.viewController.hideDialog(emitPosition = true)
+      // Hide any parent sheets that would be visible behind the new sheet
+      val newSheetTop = sheetView.viewController.getExpectedSheetTop(detentIndex)
+      for (sheet in presentedSheetStack) {
+        if (!sheet.viewController.isDialogVisible) continue
+        if (sheet.viewController.isExpanded) continue
+
+        val sheetTop = sheet.viewController.currentSheetTop
+        if (sheetTop < newSheetTop) {
+          sheet.viewController.hideDialog(emitPosition = true)
         }
       }
 

package/android/src/main/res/anim/true_sheet_fade_in.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="100"
+    android:fromAlpha="0.0"
+    android:toAlpha="1.0"
+    android:interpolator="@android:interpolator/decelerate_cubic" />

package/android/src/main/res/anim/true_sheet_fade_out.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="100"
+    android:fromAlpha="1.0"
+    android:toAlpha="0.0"
+    android:interpolator="@android:interpolator/accelerate_cubic" />

package/android/src/main/res/values/styles.xml

@@ -6,6 +6,12 @@
         <item name="android:windowExitAnimation">@anim/true_sheet_slide_out</item>
     </style>
 
+    <!-- Fast fade animation - used for hide/show when modal is presented -->
+    <style name="TrueSheetFadeAnimation" parent="Animation.AppCompat.Dialog">
+        <item name="android:windowEnterAnimation">@anim/true_sheet_fade_in</item>
+        <item name="android:windowExitAnimation">@anim/true_sheet_fade_out</item>
+    </style>
+
     <!-- Default BottomSheetDialog style with smooth animations -->
     <style name="TrueSheetDialog" parent="Theme.Design.Light.BottomSheetDialog">
         <item name="android:windowAnimationStyle">@style/TrueSheetAnimation</item>

package/package.json

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