@lodev09/react-native-true-sheet 3.0.0-beta.13 → 3.0.0-beta.14

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

@@ -14,18 +14,7 @@ import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.events.EventDispatcher
 import com.facebook.react.views.view.ReactViewGroup
 import com.lodev09.truesheet.core.TrueSheetDialogObserver
-import com.lodev09.truesheet.events.BlurEvent
-import com.lodev09.truesheet.events.DetentChangeEvent
-import com.lodev09.truesheet.events.DidDismissEvent
-import com.lodev09.truesheet.events.DidPresentEvent
-import com.lodev09.truesheet.events.DragBeginEvent
-import com.lodev09.truesheet.events.DragChangeEvent
-import com.lodev09.truesheet.events.DragEndEvent
-import com.lodev09.truesheet.events.FocusEvent
-import com.lodev09.truesheet.events.MountEvent
-import com.lodev09.truesheet.events.PositionChangeEvent
-import com.lodev09.truesheet.events.WillDismissEvent
-import com.lodev09.truesheet.events.WillPresentEvent
+import com.lodev09.truesheet.events.*
 
 /**
  * Main TrueSheet host view that manages the sheet dialog and dispatches events to JavaScript.
@@ -187,12 +176,11 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     containerView?.footerView?.eventDispatcher = null
   }
 
-  override fun viewControllerDidDismiss() {
+  override fun viewControllerDidDismiss(hadParent: Boolean) {
     val surfaceId = UIManagerHelper.getSurfaceId(this)
     eventDispatcher?.dispatchEvent(DidDismissEvent(surfaceId, id))
 
-    // Notify observer that this sheet was dismissed (will show/focus parent sheet)
-    TrueSheetDialogObserver.onSheetDidDismiss(this)
+    TrueSheetDialogObserver.onSheetDidDismiss(this, hadParent)
   }
 
   override fun viewControllerDidChangeDetent(index: Int, position: Float, detent: Float) {
@@ -224,11 +212,21 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     updateState(width, height)
   }
 
+  override fun viewControllerWillFocus() {
+    val surfaceId = UIManagerHelper.getSurfaceId(this)
+    eventDispatcher?.dispatchEvent(WillFocusEvent(surfaceId, id))
+  }
+
   override fun viewControllerDidFocus() {
     val surfaceId = UIManagerHelper.getSurfaceId(this)
     eventDispatcher?.dispatchEvent(FocusEvent(surfaceId, id))
   }
 
+  override fun viewControllerWillBlur() {
+    val surfaceId = UIManagerHelper.getSurfaceId(this)
+    eventDispatcher?.dispatchEvent(WillBlurEvent(surfaceId, id))
+  }
+
   override fun viewControllerDidBlur() {
     val surfaceId = UIManagerHelper.getSurfaceId(this)
     eventDispatcher?.dispatchEvent(BlurEvent(surfaceId, id))
@@ -309,11 +307,9 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
 
   @UiThread
   fun present(detentIndex: Int, animated: Boolean = true, promiseCallback: () -> Unit) {
-    // Notify observer that this sheet will present (will hide/blur topmost sheet)
     if (!viewController.isPresented) {
-      TrueSheetDialogObserver.onSheetWillPresent(this, detentIndex)
+      viewController.parentSheetView = TrueSheetDialogObserver.onSheetWillPresent(this, detentIndex)
     }
-
     viewController.presentPromise = promiseCallback
     viewController.present(detentIndex, animated)
   }

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

@@ -34,14 +34,16 @@ interface TrueSheetViewControllerDelegate {
   fun viewControllerWillPresent(index: Int, position: Float, detent: Float)
   fun viewControllerDidPresent(index: Int, position: Float, detent: Float)
   fun viewControllerWillDismiss()
-  fun viewControllerDidDismiss()
+  fun viewControllerDidDismiss(hadParent: Boolean)
   fun viewControllerDidChangeDetent(index: Int, position: Float, detent: Float)
   fun viewControllerDidDragBegin(index: Int, position: Float, detent: Float)
   fun viewControllerDidDragChange(index: Int, position: Float, detent: Float)
   fun viewControllerDidDragEnd(index: Int, position: Float, detent: Float)
   fun viewControllerDidChangePosition(index: Float, position: Float, detent: Float, transitioning: Boolean)
   fun viewControllerDidChangeSize(width: Int, height: Int)
+  fun viewControllerWillFocus()
   fun viewControllerDidFocus()
+  fun viewControllerWillBlur()
   fun viewControllerDidBlur()
 }
 
@@ -109,6 +111,9 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   var isPresented = false
     private set
 
+  var isDialogVisible = false
+    private set
+
   var currentDetentIndex: Int = -1
     private set
 
@@ -119,6 +124,9 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   var presentPromise: (() -> Unit)? = null
   var dismissPromise: (() -> Unit)? = null
 
+  // Reference to parent TrueSheetView (if presented from another sheet)
+  var parentSheetView: TrueSheetView? = null
+
   // ====================================================================
   // MARK: - Configuration Properties
   // ====================================================================
@@ -242,12 +250,14 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     dialog = null
     isDragging = false
     isPresented = false
+    isDialogVisible = false
     lastEmittedPositionPx = -1
   }
 
   private fun setupDialogListeners(dialog: BottomSheetDialog) {
     dialog.setOnShowListener {
       isPresented = true
+      isDialogVisible = true
       resetAnimation()
       setupBackground()
       setupGrabber()
@@ -259,6 +269,9 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
         delegate?.viewControllerDidPresent(detentInfo.index, detentInfo.position, detent)
         emitChangePositionDelegate(detentInfo.index, positionPx, transitioning = true)
 
+        // Notify parent sheet that it has lost focus (after this sheet appeared)
+        parentSheetView?.viewControllerDidBlur()
+
         presentPromise?.invoke()
         presentPromise = null
 
@@ -267,13 +280,22 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     }
 
     dialog.setOnCancelListener {
+      // Notify parent sheet that it is about to regain focus
+      parentSheetView?.viewControllerWillFocus()
+
       delegate?.viewControllerWillDismiss()
     }
 
     dialog.setOnDismissListener {
+      val hadParent = parentSheetView != null
+
+      // Notify parent sheet that it has regained focus
+      parentSheetView?.viewControllerDidFocus()
+      parentSheetView = null
+
       dismissPromise?.invoke()
       dismissPromise = null
-      delegate?.viewControllerDidDismiss()
+      delegate?.viewControllerDidDismiss(hadParent)
       cleanupDialog()
     }
   }
@@ -374,9 +396,10 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
   /**
    * Hides the dialog without dismissing it.
-   * Used when another TrueSheet presents on top.
+   * Used when another TrueSheet presents on top or when RN screen is presented.
    */
   fun hideDialog() {
+    isDialogVisible = false
     dialog?.window?.decorView?.visibility = View.INVISIBLE
 
     // Emit off-screen position (detent = 0 since sheet is fully hidden)
@@ -388,6 +411,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
    * Used when the sheet on top dismisses.
    */
   fun showDialog() {
+    isDialogVisible = true
     dialog?.window?.decorView?.visibility = View.VISIBLE
 
     // Emit current position
@@ -420,6 +444,10 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
       val detentInfo = getDetentInfoForIndex(detentIndex)
       val detent = getDetentValueForIndex(detentInfo.index)
+
+      // Notify parent sheet that it is about to lose focus (before this sheet appears)
+      parentSheetView?.viewControllerWillBlur()
+
       delegate?.viewControllerWillPresent(detentInfo.index, detentInfo.position, detent)
 
       if (!animated) {

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

@@ -67,7 +67,11 @@ class TrueSheetViewManager :
       DragBeginEvent.EVENT_NAME to hashMapOf("registrationName" to DragBeginEvent.REGISTRATION_NAME),
       DragChangeEvent.EVENT_NAME to hashMapOf("registrationName" to DragChangeEvent.REGISTRATION_NAME),
       DragEndEvent.EVENT_NAME to hashMapOf("registrationName" to DragEndEvent.REGISTRATION_NAME),
-      PositionChangeEvent.EVENT_NAME to hashMapOf("registrationName" to PositionChangeEvent.REGISTRATION_NAME)
+      PositionChangeEvent.EVENT_NAME to hashMapOf("registrationName" to PositionChangeEvent.REGISTRATION_NAME),
+      WillFocusEvent.EVENT_NAME to hashMapOf("registrationName" to WillFocusEvent.REGISTRATION_NAME),
+      FocusEvent.EVENT_NAME to hashMapOf("registrationName" to FocusEvent.REGISTRATION_NAME),
+      WillBlurEvent.EVENT_NAME to hashMapOf("registrationName" to WillBlurEvent.REGISTRATION_NAME),
+      BlurEvent.EVENT_NAME to hashMapOf("registrationName" to BlurEvent.REGISTRATION_NAME)
     )
 
   // ==================== Props ====================

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

@@ -3,76 +3,54 @@ package com.lodev09.truesheet.core
 import com.lodev09.truesheet.TrueSheetView
 
 /**
- * Observes TrueSheet dialog lifecycle to manage sheet stacking.
- * Automatically hides/shows sheets and dispatches focus/blur events
- * when sheets are presented on top of each other.
+ * Manages TrueSheet stacking behavior.
+ * Tracks presented sheets and handles visibility when sheets stack on top of each other.
  */
 object TrueSheetDialogObserver {
 
-  /**
-   * Stack of currently presented sheet views (most recent on top)
-   */
   private val presentedSheetStack = mutableListOf<TrueSheetView>()
 
   /**
    * Called when a sheet is about to be presented.
-   * Hides and blurs the current topmost sheet if exists.
-   *
-   * @param sheetView The sheet that is about to be presented
-   * @param detentIndex The detent index the sheet will be presented at
+   * Returns the visible parent sheet to stack on, or null if none.
    */
   @JvmStatic
-  fun onSheetWillPresent(sheetView: TrueSheetView, detentIndex: Int) {
+  fun onSheetWillPresent(sheetView: TrueSheetView, detentIndex: Int): TrueSheetView? {
     synchronized(presentedSheetStack) {
-      // Get the current topmost sheet
-      val topSheet = presentedSheetStack.lastOrNull()
-
-      // Hide and blur the topmost sheet if it exists
-      topSheet?.let {
-        // Don't hide if the top sheet is fully expanded (covers the screen)
-        // or if the top sheet is smaller than the presenting sheet
-        // A smaller topSheetTop value means the sheet is taller (closer to top of screen)
-        val topSheetTop = it.viewController.currentSheetTop
-        val presentingSheetTop = sheetView.viewController.getExpectedSheetTop(detentIndex)
+      val parentSheet = presentedSheetStack.lastOrNull()
+        ?.takeIf { it.viewController.isPresented && it.viewController.isDialogVisible }
 
-        if (!it.viewController.isExpanded && topSheetTop <= presentingSheetTop) {
+      // 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()
         }
-        it.viewControllerDidBlur()
       }
 
-      // Add new sheet to stack
       if (!presentedSheetStack.contains(sheetView)) {
         presentedSheetStack.add(sheetView)
       }
+
+      return parentSheet
     }
   }
 
   /**
    * Called when a sheet has been dismissed.
-   * Shows and focuses the sheet below it (if any).
-   *
-   * @param sheetView The sheet that was dismissed
+   * Shows the parent sheet if this sheet was stacked on it.
    */
   @JvmStatic
-  fun onSheetDidDismiss(sheetView: TrueSheetView) {
+  fun onSheetDidDismiss(sheetView: TrueSheetView, hadParent: Boolean) {
     synchronized(presentedSheetStack) {
       presentedSheetStack.remove(sheetView)
-
-      // Show and focus the new topmost sheet
-      presentedSheetStack.lastOrNull()?.let {
-        it.viewController.showDialog()
-        it.viewControllerDidFocus()
+      if (hadParent) {
+        presentedSheetStack.lastOrNull()?.viewController?.showDialog()
       }
     }
   }
 
-  /**
-   * Removes a sheet from the stack without triggering focus events.
-   * Used when a sheet is being destroyed/cleaned up.
-   *
-   * @param sheetView The sheet to remove
-   */
   @JvmStatic
   fun removeSheet(sheetView: TrueSheetView) {
     synchronized(presentedSheetStack) {
@@ -80,10 +58,6 @@ object TrueSheetDialogObserver {
     }
   }
 
-  /**
-   * Clears all tracked sheets.
-   * Used when the module is invalidated.
-   */
   @JvmStatic
   fun clear() {
     synchronized(presentedSheetStack) {

package/android/src/main/java/com/lodev09/truesheet/events/TrueSheetDragEvents.kt

@@ -0,0 +1,71 @@
+package com.lodev09.truesheet.events
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+
+/**
+ * Fired when dragging begins
+ * Payload: { index: number, position: number, detent: number }
+ */
+class DragBeginEvent(surfaceId: Int, viewId: Int, private val index: Int, private val position: Float, private val detent: Float) :
+  Event<DragBeginEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap =
+    Arguments.createMap().apply {
+      putInt("index", index)
+      putDouble("position", position.toDouble())
+      putDouble("detent", detent.toDouble())
+    }
+
+  companion object {
+    const val EVENT_NAME = "topDragBegin"
+    const val REGISTRATION_NAME = "onDragBegin"
+  }
+}
+
+/**
+ * Fired continuously during dragging
+ * Payload: { index: number, position: number, detent: number }
+ */
+class DragChangeEvent(surfaceId: Int, viewId: Int, private val index: Int, private val position: Float, private val detent: Float) :
+  Event<DragChangeEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap =
+    Arguments.createMap().apply {
+      putInt("index", index)
+      putDouble("position", position.toDouble())
+      putDouble("detent", detent.toDouble())
+    }
+
+  companion object {
+    const val EVENT_NAME = "topDragChange"
+    const val REGISTRATION_NAME = "onDragChange"
+  }
+}
+
+/**
+ * Fired when dragging ends
+ * Payload: { index: number, position: number, detent: number }
+ */
+class DragEndEvent(surfaceId: Int, viewId: Int, private val index: Int, private val position: Float, private val detent: Float) :
+  Event<DragEndEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap =
+    Arguments.createMap().apply {
+      putInt("index", index)
+      putDouble("position", position.toDouble())
+      putDouble("detent", detent.toDouble())
+    }
+
+  companion object {
+    const val EVENT_NAME = "topDragEnd"
+    const val REGISTRATION_NAME = "onDragEnd"
+  }
+}

package/android/src/main/java/com/lodev09/truesheet/events/TrueSheetFocusEvents.kt

@@ -0,0 +1,65 @@
+package com.lodev09.truesheet.events
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+
+/**
+ * Fired when the sheet is about to regain focus because a sheet on top of it is being dismissed
+ */
+class WillFocusEvent(surfaceId: Int, viewId: Int) : Event<WillFocusEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap = Arguments.createMap()
+
+  companion object {
+    const val EVENT_NAME = "topWillFocus"
+    const val REGISTRATION_NAME = "onWillFocus"
+  }
+}
+
+/**
+ * Fired when the sheet regains focus after a sheet on top of it is dismissed
+ */
+class FocusEvent(surfaceId: Int, viewId: Int) : Event<FocusEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap = Arguments.createMap()
+
+  companion object {
+    const val EVENT_NAME = "topDidFocus"
+    const val REGISTRATION_NAME = "onDidFocus"
+  }
+}
+
+/**
+ * Fired when the sheet is about to lose focus because another sheet is being presented on top of it
+ */
+class WillBlurEvent(surfaceId: Int, viewId: Int) : Event<WillBlurEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap = Arguments.createMap()
+
+  companion object {
+    const val EVENT_NAME = "topWillBlur"
+    const val REGISTRATION_NAME = "onWillBlur"
+  }
+}
+
+/**
+ * Fired when the sheet loses focus because another sheet is presented on top of it
+ */
+class BlurEvent(surfaceId: Int, viewId: Int) : Event<BlurEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap = Arguments.createMap()
+
+  companion object {
+    const val EVENT_NAME = "topDidBlur"
+    const val REGISTRATION_NAME = "onDidBlur"
+  }
+}

package/android/src/main/java/com/lodev09/truesheet/events/TrueSheetLifecycleEvents.kt

@@ -0,0 +1,94 @@
+package com.lodev09.truesheet.events
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+
+/**
+ * Fired when the sheet component is mounted and ready
+ */
+class MountEvent(surfaceId: Int, viewId: Int) : Event<MountEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap = Arguments.createMap()
+
+  companion object {
+    const val EVENT_NAME = "topMount"
+    const val REGISTRATION_NAME = "onMount"
+  }
+}
+
+/**
+ * Fired before the sheet is presented
+ * Payload: { index: number, position: number, detent: number }
+ */
+class WillPresentEvent(surfaceId: Int, viewId: Int, private val index: Int, private val position: Float, private val detent: Float) :
+  Event<WillPresentEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap =
+    Arguments.createMap().apply {
+      putInt("index", index)
+      putDouble("position", position.toDouble())
+      putDouble("detent", detent.toDouble())
+    }
+
+  companion object {
+    const val EVENT_NAME = "topWillPresent"
+    const val REGISTRATION_NAME = "onWillPresent"
+  }
+}
+
+/**
+ * Fired after the sheet is presented
+ * Payload: { index: number, position: number, detent: number }
+ */
+class DidPresentEvent(surfaceId: Int, viewId: Int, private val index: Int, private val position: Float, private val detent: Float) :
+  Event<DidPresentEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap =
+    Arguments.createMap().apply {
+      putInt("index", index)
+      putDouble("position", position.toDouble())
+      putDouble("detent", detent.toDouble())
+    }
+
+  companion object {
+    const val EVENT_NAME = "topDidPresent"
+    const val REGISTRATION_NAME = "onDidPresent"
+  }
+}
+
+/**
+ * Fired before the sheet is dismissed
+ */
+class WillDismissEvent(surfaceId: Int, viewId: Int) : Event<WillDismissEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap = Arguments.createMap()
+
+  companion object {
+    const val EVENT_NAME = "topWillDismiss"
+    const val REGISTRATION_NAME = "onWillDismiss"
+  }
+}
+
+/**
+ * Fired after the sheet is dismissed
+ */
+class DidDismissEvent(surfaceId: Int, viewId: Int) : Event<DidDismissEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap = Arguments.createMap()
+
+  companion object {
+    const val EVENT_NAME = "topDidDismiss"
+    const val REGISTRATION_NAME = "onDidDismiss"
+  }
+}

package/android/src/main/java/com/lodev09/truesheet/events/{PositionChangeEvent.kt → TrueSheetStateEvents.kt}

@@ -4,6 +4,28 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
+/**
+ * Fired when the detent changes
+ * Payload: { index: number, position: number, detent: number }
+ */
+class DetentChangeEvent(surfaceId: Int, viewId: Int, private val index: Int, private val position: Float, private val detent: Float) :
+  Event<DetentChangeEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap =
+    Arguments.createMap().apply {
+      putInt("index", index)
+      putDouble("position", position.toDouble())
+      putDouble("detent", detent.toDouble())
+    }
+
+  companion object {
+    const val EVENT_NAME = "topDetentChange"
+    const val REGISTRATION_NAME = "onDetentChange"
+  }
+}
+
 /**
  * Fired continuously for position updates during drag and animation
  * Payload: { index: number, position: number, detent: number, transitioning: boolean }