@lodev09/react-native-true-sheet 3.0.0-beta.7 → 3.0.0-beta.8

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

@@ -25,8 +25,8 @@ import com.lodev09.truesheet.events.WillDismissEvent
 import com.lodev09.truesheet.events.WillPresentEvent
 
 /**
- * Main TrueSheet host view.
- * Manages the sheet dialog and container, and dispatches events to JavaScript.
+ * Main TrueSheet host view that manages the sheet dialog and dispatches events to JavaScript.
+ * This view is hidden (GONE) and delegates all rendering to TrueSheetViewController in a dialog window.
  */
 @SuppressLint("ViewConstructor")
 class TrueSheetView(private val reactContext: ThemedReactContext) :
@@ -35,14 +35,8 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   TrueSheetViewControllerDelegate,
   TrueSheetContainerViewDelegate {
 
-  /**
-   * The TrueSheetViewController instance that acts as both root view and controller
-   */
   private val viewController: TrueSheetViewController = TrueSheetViewController(reactContext)
 
-  /**
-   * Gets the container view (first child of view controller)
-   */
   private val containerView: TrueSheetContainerView?
     get() = viewController.getChildAt(0) as? TrueSheetContainerView
 
@@ -52,24 +46,27 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   var initialDetentAnimated: Boolean = true
 
   var stateWrapper: StateWrapper? = null
+    set(value) {
+      // Immediately update state with screen width during first state update
+      // This ensures we have initial width for content layout before presenting
+      if (field == null && value != null) {
+        updateState(viewController.screenWidth, 0)
+      }
+      field = value
+    }
 
   // Track last dimensions to avoid unnecessary state updates
   private var lastContainerWidth: Int = 0
   private var lastContainerHeight: Int = 0
 
-  /**
-   * Tracks if initial presentation has been handled
-   */
-  private var hasHandledInitialPresentation = false
+  // Flag to prevent multiple pending sheet updates
+  private var isSheetUpdatePending: Boolean = false
 
   init {
     reactContext.addLifecycleEventListener(this)
-
-    // Set delegates
     viewController.delegate = this
 
-    // Hide the host view from layout and touch handling
-    // The actual content is shown in a dialog window
+    // Hide the host view - actual content is rendered in the dialog window
     visibility = GONE
   }
 
@@ -89,98 +86,66 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
 
   override fun setId(id: Int) {
     super.setId(id)
-
     viewController.id = id
     TrueSheetModule.registerView(this, id)
   }
 
   override fun onDetachedFromWindow() {
     super.onDetachedFromWindow()
-    onDropInstance()
 
-    TrueSheetModule.unregisterView(id)
+    // Don't unregister if we have active modals - we need the view for recovery
+    if (viewController.hasActiveModals()) {
+      return
+    }
+
+    onDropInstance()
   }
 
   /**
-   * showOrUpdate will display the Dialog. It is called by the manager once all properties are set
-   * because we need to know all of them before creating the Dialog. It is also smart during updates
-   * if the changed properties can be applied directly to the Dialog or require the recreation of a
-   * new Dialog.
+   * Called by the manager after all properties are set.
+   * Reconfigures the sheet if it's currently presented.
    */
-  fun showOrUpdate() {
-    // Only handle initial presentation once on mount
-    if (!hasHandledInitialPresentation && initialDetentIndex >= 0) {
-      hasHandledInitialPresentation = true
-
-      // Create dialog if not created yet
-      if (!viewController.isPresented) {
-        viewController.createDialog()
-      }
-
-      post {
-        present(initialDetentIndex, initialDetentAnimated) { }
-      }
-    } else if (viewController.isPresented) {
-      viewController.setupSheetDetents()
+  fun finalizeUpdates() {
+    if (viewController.isPresented) {
+      viewController.setupBackground()
+      viewController.setupGrabber()
+      updateSheetIfNeeded()
       viewController.setStateForDetentIndex(viewController.currentDetentIndex)
-      viewController.positionFooter()
     }
   }
 
   // ==================== View Management ====================
 
   override fun addView(child: View?, index: Int) {
-    // Add the child to our ViewController
-    // This is the TrueSheetContainerView
     viewController.addView(child, index)
 
-    // Create dialog and dispatch mount event when TrueSheetContainerView is added
     if (child is TrueSheetContainerView) {
-      // Set up container delegate to listen for content size changes
       child.delegate = this
+      viewController.createDialog()
 
-      // Get initial content height from container
-      val contentHeight = child.contentHeight
-      if (contentHeight > 0) {
-        viewController.contentHeight = contentHeight
+      // Present at initial detent after layout pass when content height is available
+      if (initialDetentIndex >= 0) {
+        post { present(initialDetentIndex, initialDetentAnimated) { } }
       }
 
-      // Create the dialog now that the container is mounted
-      viewController.createDialog()
-
       val surfaceId = UIManagerHelper.getSurfaceId(this)
-      eventDispatcher?.dispatchEvent(
-        MountEvent(surfaceId, id)
-      )
+      eventDispatcher?.dispatchEvent(MountEvent(surfaceId, id))
     }
   }
 
   override fun getChildCount(): Int = viewController.childCount
   override fun getChildAt(index: Int): View? = viewController.getChildAt(index)
 
-  override fun removeView(child: View?) {
-    if (child != null) {
-      // Clean up container delegate
-      if (child is TrueSheetContainerView) {
-        child.delegate = null
-      }
-
-      viewController.removeView(child)
-    }
-  }
-
   override fun removeViewAt(index: Int) {
     val child = getChildAt(index)
+    if (child is TrueSheetContainerView) {
+      child.delegate = null
+    }
     viewController.removeView(child)
   }
 
-  override fun addChildrenForAccessibility(outChildren: ArrayList<View>) {
-    // Explicitly override this to prevent accessibility events being passed down to children
-    // Those will be handled by the mHostView which lives in the dialog
-  }
-
-  // Explicitly override this to prevent accessibility events being passed down to children
-  // Those will be handled by the mHostView which lives in the dialog
+  // Accessibility events are handled by the dialog's host view
+  override fun addChildrenForAccessibility(outChildren: ArrayList<View>) {}
   override fun dispatchPopulateAccessibilityEvent(event: AccessibilityEvent): Boolean = false
 
   fun onDropInstance() {
@@ -194,7 +159,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   }
 
   override fun onHostResume() {
-    showOrUpdate()
+    finalizeUpdates()
   }
 
   override fun onHostPause() {
@@ -208,71 +173,55 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
 
   override fun viewControllerWillPresent(index: Int, position: Float) {
     val surfaceId = UIManagerHelper.getSurfaceId(this)
-    eventDispatcher?.dispatchEvent(
-      WillPresentEvent(surfaceId, id, index, position)
-    )
+    eventDispatcher?.dispatchEvent(WillPresentEvent(surfaceId, id, index, position))
   }
 
   override fun viewControllerDidPresent(index: Int, position: Float) {
     val surfaceId = UIManagerHelper.getSurfaceId(this)
-    eventDispatcher?.dispatchEvent(
-      DidPresentEvent(surfaceId, id, index, position)
-    )
+    eventDispatcher?.dispatchEvent(DidPresentEvent(surfaceId, id, index, position))
 
-    // Set our touch event dispatcher on the view controller
+    // Enable touch event dispatching to React Native
     viewController.eventDispatcher = eventDispatcher
+    containerView?.footerView?.eventDispatcher = eventDispatcher
   }
 
   override fun viewControllerWillDismiss() {
     val surfaceId = UIManagerHelper.getSurfaceId(this)
-    eventDispatcher?.dispatchEvent(
-      WillDismissEvent(surfaceId, id)
-    )
+    eventDispatcher?.dispatchEvent(WillDismissEvent(surfaceId, id))
 
-    // Clear our touch event dispatcher on the view controller
+    // Disable touch event dispatching
     viewController.eventDispatcher = null
+    containerView?.footerView?.eventDispatcher = null
   }
 
   override fun viewControllerDidDismiss() {
     val surfaceId = UIManagerHelper.getSurfaceId(this)
-    eventDispatcher?.dispatchEvent(
-      DidDismissEvent(surfaceId, id)
-    )
+    eventDispatcher?.dispatchEvent(DidDismissEvent(surfaceId, id))
   }
 
   override fun viewControllerDidChangeDetent(index: Int, position: Float) {
     val surfaceId = UIManagerHelper.getSurfaceId(this)
-    eventDispatcher?.dispatchEvent(
-      DetentChangeEvent(surfaceId, id, index, position)
-    )
+    eventDispatcher?.dispatchEvent(DetentChangeEvent(surfaceId, id, index, position))
   }
 
   override fun viewControllerDidDragBegin(index: Int, position: Float) {
     val surfaceId = UIManagerHelper.getSurfaceId(this)
-    eventDispatcher?.dispatchEvent(
-      DragBeginEvent(surfaceId, id, index, position)
-    )
+    eventDispatcher?.dispatchEvent(DragBeginEvent(surfaceId, id, index, position))
   }
 
   override fun viewControllerDidDragChange(index: Int, position: Float) {
     val surfaceId = UIManagerHelper.getSurfaceId(this)
-    eventDispatcher?.dispatchEvent(
-      DragChangeEvent(surfaceId, id, index, position)
-    )
+    eventDispatcher?.dispatchEvent(DragChangeEvent(surfaceId, id, index, position))
   }
 
   override fun viewControllerDidDragEnd(index: Int, position: Float) {
     val surfaceId = UIManagerHelper.getSurfaceId(this)
-    eventDispatcher?.dispatchEvent(
-      DragEndEvent(surfaceId, id, index, position)
-    )
+    eventDispatcher?.dispatchEvent(DragEndEvent(surfaceId, id, index, position))
   }
 
   override fun viewControllerDidChangePosition(index: Int, position: Float, transitioning: Boolean) {
     val surfaceId = UIManagerHelper.getSurfaceId(this)
-    eventDispatcher?.dispatchEvent(
-      PositionChangeEvent(surfaceId, id, index, position, transitioning)
-    )
+    eventDispatcher?.dispatchEvent(PositionChangeEvent(surfaceId, id, index, position, transitioning))
   }
 
   override fun viewControllerDidChangeSize(width: Int, height: Int) {
@@ -303,15 +252,13 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   }
 
   fun setCornerRadius(radius: Float) {
-    if (viewController.cornerRadius == radius) return
-    viewController.cornerRadius = radius
-    viewController.setupBackground()
+    if (viewController.sheetCornerRadius == radius) return
+    viewController.sheetCornerRadius = radius
   }
 
   fun setSheetBackgroundColor(color: Int) {
     if (viewController.sheetBackgroundColor == color) return
     viewController.sheetBackgroundColor = color
-    viewController.setupBackground()
   }
 
   fun setSoftInputMode(mode: Int) {
@@ -322,7 +269,9 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     viewController.dismissible = dismissible
   }
 
-  fun setGrabber(grabber: Boolean) {}
+  fun setGrabber(grabber: Boolean) {
+    viewController.grabber = grabber
+  }
 
   fun setDetents(newDetents: MutableList<Double>) {
     viewController.detents = newDetents
@@ -337,77 +286,62 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   // ==================== State Management ====================
 
   /**
-   * Update state with container dimensions.
-   * Called when the dialog size changes.
+   * Updates the Fabric state with container dimensions for Yoga layout.
    */
   fun updateState(width: Int, height: Int) {
-    // Skip if dimensions haven't changed
-    if (width == lastContainerWidth && height == lastContainerHeight) {
-      return
-    }
+    if (width == lastContainerWidth && height == lastContainerHeight) return
 
-    // Store new dimensions
     lastContainerWidth = width
     lastContainerHeight = height
 
     val sw = stateWrapper ?: return
-
-    val realWidth = width.toFloat().pxToDp()
-    val realHeight = height.toFloat().pxToDp()
-
     val newStateData = WritableNativeMap()
-    newStateData.putDouble("containerWidth", realWidth.toDouble())
-    newStateData.putDouble("containerHeight", realHeight.toDouble())
+    newStateData.putDouble("containerWidth", width.toFloat().pxToDp().toDouble())
+    newStateData.putDouble("containerHeight", height.toFloat().pxToDp().toDouble())
     sw.updateState(newStateData)
   }
 
-  /**
-   * Presents the sheet at the given detent index.
-   *
-   * @param detentIndex The detent index to present at
-   * @param animated Whether to animate the presentation
-   * @param promiseCallback Callback invoked when presentation completes
-   */
   @UiThread
   fun present(detentIndex: Int, animated: Boolean = true, promiseCallback: () -> Unit) {
     viewController.presentPromise = promiseCallback
     viewController.present(detentIndex, animated)
   }
 
-  /**
-   * Dismisses the sheet.
-   *
-   * @param promiseCallback Callback invoked when dismissal completes
-   */
   @UiThread
   fun dismiss(promiseCallback: () -> Unit) {
     viewController.dismissPromise = promiseCallback
     viewController.dismiss()
   }
 
-  // ==================== TrueSheetContainerViewDelegate Implementation ====================
+  /**
+   * Debounced sheet update to handle rapid content/header size changes.
+   * Uses post to ensure all layout passes complete before reconfiguring.
+   */
+  fun updateSheetIfNeeded() {
+    if (!viewController.isPresented || isSheetUpdatePending) return
 
-  override fun containerViewContentDidChangeSize(width: Int, height: Int) {
-    // Clamp content height to container height to prevent unbounded growth with scrollable content
-    val containerHeight = viewController.maxScreenHeight
-    val contentHeight = if (containerHeight > 0) minOf(height, containerHeight) else height
+    isSheetUpdatePending = true
+    viewController.post {
+      isSheetUpdatePending = false
+      viewController.setupSheetDetents()
+      viewController.positionFooter()
+    }
+  }
 
-    viewController.contentHeight = contentHeight
+  // ==================== TrueSheetContainerViewDelegate Implementation ====================
 
-    // Update detents if sheet is already presented
-    if (viewController.isPresented) {
-      // Reconfigure sheet detents with new content height
-      viewController.setupSheetDetents()
+  override fun containerViewContentDidChangeSize(width: Int, height: Int) {
+    updateSheetIfNeeded()
+  }
 
-      // Use post to ensure layout is complete before positioning footer
-      viewController.post {
-        viewController.positionFooter()
-      }
-    }
+  override fun containerViewHeaderDidChangeSize(width: Int, height: Int) {
+    updateSheetIfNeeded()
+    // Update state for scroll view behavior to work correctly with header
+    val sheetHeight = TrueSheetViewController.getEffectiveSheetHeight(viewController.height, height)
+    updateState(viewController.width, sheetHeight)
   }
 
   override fun containerViewFooterDidChangeSize(width: Int, height: Int) {
-    // Reposition footer when its size changes
     if (viewController.isPresented) {
       viewController.positionFooter()
     }