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

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

@@ -1,8 +1,10 @@
 package com.lodev09.truesheet
 
 import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.PointerEvents
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.annotations.ReactProp
 
 /**
  * ViewManager for TrueSheetContainerView
@@ -15,6 +17,11 @@ class TrueSheetContainerViewManager : ViewGroupManager<TrueSheetContainerView>()
 
   override fun createViewInstance(reactContext: ThemedReactContext): TrueSheetContainerView = TrueSheetContainerView(reactContext)
 
+  @ReactProp(name = "pointerEvents")
+  fun setPointerEvents(view: TrueSheetContainerView, pointerEventsStr: String?) {
+    view.pointerEvents = PointerEvents.parsePointerEvents(pointerEventsStr)
+  }
+
   companion object {
     const val REACT_CLASS = "TrueSheetContainerView"
   }

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

@@ -1,8 +1,10 @@
 package com.lodev09.truesheet
 
 import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.PointerEvents
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.annotations.ReactProp
 
 /**
  * ViewManager for TrueSheetContentView
@@ -15,6 +17,11 @@ class TrueSheetContentViewManager : ViewGroupManager<TrueSheetContentView>() {
 
   override fun createViewInstance(reactContext: ThemedReactContext): TrueSheetContentView = TrueSheetContentView(reactContext)
 
+  @ReactProp(name = "pointerEvents")
+  fun setPointerEvents(view: TrueSheetContentView, pointerEventsStr: String?) {
+    view.pointerEvents = PointerEvents.parsePointerEvents(pointerEventsStr)
+  }
+
   companion object {
     const val REACT_CLASS = "TrueSheetContentView"
   }

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

@@ -1,8 +1,10 @@
 package com.lodev09.truesheet
 
 import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.PointerEvents
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.annotations.ReactProp
 
 /**
  * ViewManager for TrueSheetFooterView
@@ -15,6 +17,11 @@ class TrueSheetFooterViewManager : ViewGroupManager<TrueSheetFooterView>() {
 
   override fun createViewInstance(reactContext: ThemedReactContext): TrueSheetFooterView = TrueSheetFooterView(reactContext)
 
+  @ReactProp(name = "pointerEvents")
+  fun setPointerEvents(view: TrueSheetFooterView, pointerEventsStr: String?) {
+    view.pointerEvents = PointerEvents.parsePointerEvents(pointerEventsStr)
+  }
+
   companion object {
     const val REACT_CLASS = "TrueSheetFooterView"
   }

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

@@ -1,8 +1,10 @@
 package com.lodev09.truesheet
 
 import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.PointerEvents
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.annotations.ReactProp
 
 /**
  * ViewManager for TrueSheetHeaderView
@@ -15,6 +17,11 @@ class TrueSheetHeaderViewManager : ViewGroupManager<TrueSheetHeaderView>() {
 
   override fun createViewInstance(reactContext: ThemedReactContext): TrueSheetHeaderView = TrueSheetHeaderView(reactContext)
 
+  @ReactProp(name = "pointerEvents")
+  fun setPointerEvents(view: TrueSheetHeaderView, pointerEventsStr: String?) {
+    view.pointerEvents = PointerEvents.parsePointerEvents(pointerEventsStr)
+  }
+
   companion object {
     const val REACT_CLASS = "TrueSheetHeaderView"
   }

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

@@ -151,6 +151,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   // ==================== Lifecycle ====================
 
   override fun onHostResume() {
+    viewController.reapplyHiddenState()
     finalizeUpdates()
   }
 
@@ -277,10 +278,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     if (!viewController.isPresented) {
       // Attach coordinator to the root container
       rootContainerView = findRootContainerView()
-      viewController.coordinatorLayout?.let { coordinator ->
-        rootContainerView?.addView(coordinator)
-        coordinator.post { measureCoordinatorLayout() }
-      }
+      viewController.coordinatorLayout?.let { rootContainerView?.addView(it) }
 
       // Register with observer to track sheet stack hierarchy
       viewController.parentSheetView = TrueSheetStackManager.onSheetWillPresent(this, detentIndex)
@@ -436,7 +434,6 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
 
   override fun viewControllerDidChangeSize(width: Int, height: Int) {
     updateState(width, height)
-    measureCoordinatorLayout()
   }
 
   override fun viewControllerWillFocus() {
@@ -481,19 +478,6 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
 
   // ==================== Private Helpers ====================
 
-  private fun measureCoordinatorLayout() {
-    val coordinator = viewController.coordinatorLayout ?: return
-    val width = viewController.screenWidth
-    val height = viewController.realScreenHeight
-
-    if (width > 0 && height > 0) {
-      val widthSpec = View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.EXACTLY)
-      val heightSpec = View.MeasureSpec.makeMeasureSpec(height, View.MeasureSpec.EXACTLY)
-      coordinator.measure(widthSpec, heightSpec)
-      coordinator.layout(0, 0, width, height)
-    }
-  }
-
   /**
    * Find the root container view for presenting the sheet.
    * This traverses up the view hierarchy to find the content view (android.R.id.content)
@@ -502,20 +486,14 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
    */
   private fun findRootContainerView(): ViewGroup? {
     var current: android.view.ViewParent? = parent
-    var contentView: ViewGroup? = null
 
     while (current != null) {
-      if (current is ViewGroup) {
-        if (current.javaClass.name == "com.swmansion.rnscreens.Screen") {
-          return current
-        }
-        if (contentView == null && current.id == android.R.id.content) {
-          contentView = current
-        }
+      if (current is ViewGroup && current.id == android.R.id.content) {
+        return current
       }
       current = current.parent
     }
 
-    return contentView ?: reactContext.currentActivity?.findViewById(android.R.id.content)
+    return reactContext.currentActivity?.findViewById(android.R.id.content)
   }
 }

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

@@ -23,6 +23,7 @@ import com.facebook.react.util.RNLog
 import com.facebook.react.views.view.ReactViewGroup
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.lodev09.truesheet.core.GrabberOptions
+import com.lodev09.truesheet.core.RNScreensFragmentObserver
 import com.lodev09.truesheet.core.TrueSheetBottomSheetView
 import com.lodev09.truesheet.core.TrueSheetBottomSheetViewDelegate
 import com.lodev09.truesheet.core.TrueSheetCoordinatorLayout
@@ -89,6 +90,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     private const val DEFAULT_CORNER_RADIUS = 16 // dp
     private const val TRANSLATE_ANIMATION_DURATION = 200L
     private const val DISMISS_DURATION = 200L
+    private const val MODAL_FADE_DURATION = 150L
   }
 
   // =============================================================================
@@ -128,6 +130,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
   private var interactionState: InteractionState = InteractionState.Idle
   private var isDismissing = false
+  private var wasHiddenByModal = false
   private var shouldAnimatePresent = false
   private var isPresentAnimating = false
 
@@ -147,6 +150,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
   // Helper Objects
   private var keyboardObserver: TrueSheetKeyboardObserver? = null
+  private var rnScreensObserver: RNScreensFragmentObserver? = null
   internal val detentCalculator = TrueSheetDetentCalculator(reactContext).apply {
     delegate = this@TrueSheetViewController
   }
@@ -303,6 +307,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
   private fun cleanupSheet() {
     cleanupKeyboardObserver()
+    cleanupModalObserver()
     cleanupBackCallback()
     sheetView?.animate()?.cancel()
 
@@ -322,6 +327,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     isDismissing = false
     isPresented = false
     isSheetVisible = false
+    wasHiddenByModal = false
     isPresentAnimating = false
     lastEmittedPositionPx = -1
     detentIndexBeforeKeyboard = -1
@@ -498,6 +504,84 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     }
   }
 
+  // =============================================================================
+  // MARK: - Modal Observer (react-native-screens)
+  // =============================================================================
+
+  private fun setupModalObserver() {
+    rnScreensObserver = RNScreensFragmentObserver(
+      reactContext = reactContext,
+      onModalPresented = {
+        if (isPresented && isSheetVisible && isTopmostSheet) {
+          hideForModal()
+        }
+      },
+      onModalWillDismiss = {
+        if (isPresented && wasHiddenByModal && isTopmostSheet) {
+          showAfterModal()
+        }
+      },
+      onModalDidDismiss = {
+        if (isPresented && wasHiddenByModal) {
+          wasHiddenByModal = false
+          // Restore parent sheet after this sheet is restored
+          parentSheetView?.viewController?.let { parent ->
+            post { parent.showAfterModal() }
+          }
+        }
+      }
+    )
+    rnScreensObserver?.start()
+  }
+
+  private fun cleanupModalObserver() {
+    rnScreensObserver?.stop()
+    rnScreensObserver = null
+  }
+
+  private fun setSheetVisibility(visible: Boolean) {
+    coordinatorLayout?.visibility = if (visible) VISIBLE else GONE
+    dimViews.forEach { it.visibility = if (visible) VISIBLE else INVISIBLE }
+  }
+
+  private fun hideForModal() {
+    val sheet = sheetView ?: run {
+      RNLog.e(reactContext, "TrueSheet: sheetView is null in hideForModal")
+      return
+    }
+
+    isSheetVisible = false
+    wasHiddenByModal = true
+
+    dimViews.forEach { it.animate().alpha(0f).setDuration(MODAL_FADE_DURATION).start() }
+    sheet.animate()
+      .alpha(0f)
+      .setDuration(MODAL_FADE_DURATION)
+      .withEndAction {
+        setSheetVisibility(false)
+      }
+      .start()
+
+    // This will hide parent sheets first
+    parentSheetView?.viewController?.hideForModal()
+  }
+
+  private fun showAfterModal() {
+    isSheetVisible = true
+    setSheetVisibility(true)
+    sheetView?.alpha = 1f
+    updateDimAmount(animated = true)
+  }
+
+  /**
+   * Re-applies hidden state after returning from background.
+   * Android may restore visibility on activity resume, so we need to hide it again.
+   */
+  fun reapplyHiddenState() {
+    if (!wasHiddenByModal) return
+    setSheetVisibility(false)
+  }
+
   // =============================================================================
   // MARK: - Presentation
   // =============================================================================
@@ -529,6 +613,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       setupSheetDetents()
       setupDimmedBackground(currentDetentIndex)
       setupKeyboardObserver()
+      setupModalObserver()
       setupBackCallback()
 
       sheet.setupBackground()
@@ -794,6 +879,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   // =============================================================================
 
   private fun shouldHandleKeyboard(checkFocus: Boolean = true): Boolean {
+    if (wasHiddenByModal) return false
     if (!isTopmostSheet) return false
     if (checkFocus && !isFocusedViewWithinSheet()) return false
     return true

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

@@ -0,0 +1,181 @@
+package com.lodev09.truesheet.core
+
+import android.content.Context
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import com.facebook.react.bridge.ReactContext
+
+private const val RN_SCREENS_PACKAGE = "com.swmansion.rnscreens"
+
+/**
+ * Observes fragment lifecycle to detect react-native-screens modal presentation.
+ * Automatically notifies when modals are presented/dismissed.
+ */
+class RNScreensFragmentObserver(
+  private val reactContext: ReactContext,
+  private val onModalPresented: () -> Unit,
+  private val onModalWillDismiss: () -> Unit,
+  private val onModalDidDismiss: () -> Unit
+) {
+  private var fragmentLifecycleCallback: FragmentManager.FragmentLifecycleCallbacks? = null
+  private var activityLifecycleObserver: DefaultLifecycleObserver? = null
+  private val activeModalFragments: MutableSet<Fragment> = mutableSetOf()
+  private var isActivityInForeground = true
+  private var pendingDismissRunnable: Runnable? = null
+
+  /**
+   * Start observing fragment lifecycle events.
+   */
+  fun start() {
+    val activity = reactContext.currentActivity as? AppCompatActivity ?: return
+    val fragmentManager = activity.supportFragmentManager
+
+    // Track activity foreground state to ignore fragment lifecycle events during background/foreground transitions
+    activityLifecycleObserver = object : DefaultLifecycleObserver {
+      override fun onResume(owner: LifecycleOwner) {
+        isActivityInForeground = true
+      }
+
+      override fun onPause(owner: LifecycleOwner) {
+        isActivityInForeground = false
+      }
+    }
+    activity.lifecycle.addObserver(activityLifecycleObserver!!)
+
+    fragmentLifecycleCallback = object : FragmentManager.FragmentLifecycleCallbacks() {
+      override fun onFragmentAttached(fm: FragmentManager, f: Fragment, context: Context) {
+        super.onFragmentAttached(fm, f, context)
+
+        // Ignore if app is resuming from background
+        if (!isActivityInForeground) return
+
+        if (isModalFragment(f) && !activeModalFragments.contains(f)) {
+          // Cancel any pending dismiss since a modal is being presented
+          cancelPendingDismiss()
+
+          activeModalFragments.add(f)
+
+          if (activeModalFragments.size == 1) {
+            onModalPresented()
+          }
+        }
+      }
+
+      override fun onFragmentStopped(fm: FragmentManager, f: Fragment) {
+        super.onFragmentStopped(fm, f)
+
+        // Ignore if app is going to background (fragments stop with activity)
+        if (!isActivityInForeground) return
+
+        // Only trigger when fragment is being removed (not just stopped for navigation)
+        if (activeModalFragments.contains(f) && f.isRemoving) {
+          activeModalFragments.remove(f)
+
+          if (activeModalFragments.isEmpty()) {
+            // Post dismiss to allow fragment attach to cancel if navigation is happening
+            schedulePendingDismiss()
+          }
+        }
+      }
+
+      override fun onFragmentDestroyed(fm: FragmentManager, f: Fragment) {
+        super.onFragmentDestroyed(fm, f)
+
+        if (activeModalFragments.isEmpty() && pendingDismissRunnable == null) {
+          onModalDidDismiss()
+        }
+      }
+    }
+
+    fragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleCallback!!, true)
+  }
+
+  /**
+   * Stop observing and cleanup.
+   */
+  fun stop() {
+    val activity = reactContext.currentActivity as? AppCompatActivity
+
+    cancelPendingDismiss()
+
+    fragmentLifecycleCallback?.let { callback ->
+      activity?.supportFragmentManager?.unregisterFragmentLifecycleCallbacks(callback)
+    }
+    fragmentLifecycleCallback = null
+
+    activityLifecycleObserver?.let { observer ->
+      activity?.lifecycle?.removeObserver(observer)
+    }
+    activityLifecycleObserver = null
+
+    activeModalFragments.clear()
+  }
+
+  private fun schedulePendingDismiss() {
+    val activity = reactContext.currentActivity ?: return
+    val decorView = activity.window?.decorView ?: return
+
+    cancelPendingDismiss()
+
+    pendingDismissRunnable = Runnable {
+      pendingDismissRunnable = null
+      if (activeModalFragments.isEmpty()) {
+        onModalWillDismiss()
+      }
+    }
+    decorView.post(pendingDismissRunnable)
+  }
+
+  private fun cancelPendingDismiss() {
+    val activity = reactContext.currentActivity ?: return
+    val decorView = activity.window?.decorView ?: return
+
+    pendingDismissRunnable?.let {
+      decorView.removeCallbacks(it)
+      pendingDismissRunnable = null
+    }
+  }
+
+  companion object {
+    /**
+     * Check if fragment is from react-native-screens.
+     */
+    private fun isScreensFragment(fragment: Fragment): Boolean = fragment.javaClass.name.startsWith(RN_SCREENS_PACKAGE)
+
+    /**
+     * Check if fragment is a react-native-screens modal (fullScreenModal, transparentModal, or formSheet).
+     * Uses reflection to check the fragment's screen.stackPresentation property.
+     */
+    private fun isModalFragment(fragment: Fragment): Boolean {
+      val className = fragment.javaClass.name
+
+      if (!isScreensFragment(fragment)) {
+        return false
+      }
+
+      // ScreenModalFragment is always a modal (used for formSheet with BottomSheetDialog)
+      if (className.contains("ScreenModalFragment")) {
+        return true
+      }
+
+      // For ScreenStackFragment, check the screen's stackPresentation via reflection
+      try {
+        val getScreenMethod = fragment.javaClass.getMethod("getScreen")
+        val screen = getScreenMethod.invoke(fragment) ?: return false
+
+        val getStackPresentationMethod = screen.javaClass.getMethod("getStackPresentation")
+        val stackPresentation = getStackPresentationMethod.invoke(screen) ?: return false
+
+        val presentationName = stackPresentation.toString()
+        return presentationName == "MODAL" ||
+          presentationName == "TRANSPARENT_MODAL" ||
+          presentationName == "FORM_SHEET"
+      } catch (e: Exception) {
+        return false
+      }
+    }
+  }
+}

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

@@ -68,11 +68,12 @@ class TrueSheetDimView(private val reactContext: ThemedReactContext) :
 
   /**
    * Attaches this dim view to a target view group.
+   * For CoordinatorLayout usage, pass null to use the default (activity's decor view).
    * For stacked sheets, pass the parent sheet's bottom sheet view with corner radius.
    */
-  fun attach(view: ViewGroup, cornerRadius: Float = 0f) {
+  fun attach(view: ViewGroup? = null, cornerRadius: Float = 0f) {
     if (parent != null) return
-    targetView = view
+    targetView = view ?: reactContext.currentActivity?.window?.decorView as? ViewGroup
 
     if (cornerRadius > 0f) {
       outlineProvider = object : ViewOutlineProvider() {
@@ -86,19 +87,7 @@ class TrueSheetDimView(private val reactContext: ThemedReactContext) :
       clipToOutline = false
     }
 
-    view.addView(this)
-
-    // Manually measure and layout for React Native views (they don't layout native children)
-    view.post {
-      val width = view.width
-      val height = view.height
-      if (width > 0 && height > 0) {
-        val widthSpec = MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY)
-        val heightSpec = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
-        measure(widthSpec, heightSpec)
-        layout(0, 0, width, height)
-      }
-    }
+    targetView?.addView(this)
   }
 
   /**

package/package.json

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