@lodev09/react-native-true-sheet 3.5.0-beta.1 → 3.5.1-beta.0

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

@@ -1,7 +1,6 @@
 package com.lodev09.truesheet
 
 import android.annotation.SuppressLint
-import android.util.Log
 import android.view.View
 import android.view.ViewStructure
 import android.view.accessibility.AccessibilityEvent
@@ -30,6 +29,12 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   TrueSheetViewControllerDelegate,
   TrueSheetContainerViewDelegate {
 
+  companion object {
+    const val TAG_NAME = "TrueSheet"
+  }
+
+  // ==================== Properties ====================
+
   internal val viewController: TrueSheetViewController = TrueSheetViewController(reactContext)
 
   private val containerView: TrueSheetContainerView?
@@ -37,26 +42,29 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
 
   var eventDispatcher: EventDispatcher? = null
 
+  // Initial present configuration (set by ViewManager before mount)
+  var pendingInitialPresent: Boolean = false
   var initialDetentIndex: Int = -1
   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
+      // On first state wrapper assignment, immediately update state with screen dimensions.
+      // This ensures Yoga has initial width/height for content layout before presenting.
       if (field == null && value != null) {
         updateState(viewController.screenWidth, viewController.screenHeight)
       }
       field = value
     }
 
-  // Track last dimensions to avoid unnecessary state updates
   private var lastContainerWidth: Int = 0
   private var lastContainerHeight: Int = 0
 
-  // Flag to prevent multiple pending sheet updates
+  // Debounce flag to coalesce rapid layout changes into a single sheet update
   private var isSheetUpdatePending: Boolean = false
 
+  // ==================== Initialization ====================
+
   init {
     reactContext.addLifecycleEventListener(this)
     viewController.delegate = this
@@ -65,6 +73,8 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     visibility = GONE
   }
 
+  // ==================== ReactViewGroup Overrides ====================
+
   override fun dispatchProvideStructure(structure: ViewStructure) {
     super.dispatchProvideStructure(structure)
   }
@@ -76,7 +86,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     right: Int,
     bottom: Int
   ) {
-    // Do nothing as we are laid out by UIManager
+    // No-op: layout is managed by React Native's UIManager
   }
 
   override fun setId(id: Int) {
@@ -85,19 +95,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     TrueSheetModule.registerView(this, id)
   }
 
-  /**
-   * Called by the manager after all properties are set.
-   * Reconfigures the sheet if it's currently presented.
-   */
-  fun finalizeUpdates() {
-    if (viewController.isPresented) {
-      viewController.setupBackground()
-      viewController.setupGrabber()
-      updateSheetIfNeeded()
-    }
-  }
-
-  // ==================== View Management ====================
+  // ==================== View Hierarchy Management ====================
 
   override fun addView(child: View?, index: Int) {
     viewController.addView(child, index)
@@ -106,9 +104,8 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
       child.delegate = this
       viewController.createDialog()
 
-      // Present at initial detent after layout pass when content height is available
       if (initialDetentIndex >= 0) {
-        post { present(initialDetentIndex, initialDetentAnimated) { } }
+        pendingInitialPresent = true
       }
 
       val surfaceId = UIManagerHelper.getSurfaceId(this)
@@ -117,6 +114,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   }
 
   override fun getChildCount(): Int = viewController.childCount
+
   override fun getChildAt(index: Int): View? = viewController.getChildAt(index)
 
   override fun removeViewAt(index: Int) {
@@ -127,119 +125,46 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     viewController.removeView(child)
   }
 
-  // Accessibility events are handled by the dialog's host view
+  // Accessibility: delegate to dialog's host view since this view is hidden
   override fun addChildrenForAccessibility(outChildren: ArrayList<View>) {}
   override fun dispatchPopulateAccessibilityEvent(event: AccessibilityEvent): Boolean = false
 
-  fun onDropInstance() {
-    reactContext.removeLifecycleEventListener(this)
-    TrueSheetModule.unregisterView(id)
-    TrueSheetDialogObserver.removeSheet(this)
-
-    if (viewController.isPresented) {
-      viewController.dismiss()
-    }
-    viewController.delegate = null
-  }
+  // ==================== Lifecycle ====================
 
   override fun onHostResume() {
     finalizeUpdates()
   }
 
-  override fun onHostPause() {
-  }
+  override fun onHostPause() {}
 
   override fun onHostDestroy() {
     onDropInstance()
   }
 
-  // ==================== TrueSheetViewControllerDelegate Implementation ====================
-
-  override fun viewControllerWillPresent(index: Int, position: Float, detent: Float) {
-    val surfaceId = UIManagerHelper.getSurfaceId(this)
-    eventDispatcher?.dispatchEvent(WillPresentEvent(surfaceId, id, index, position, detent))
-
-    // Enable touch event dispatching to React Native
-    viewController.eventDispatcher = eventDispatcher
-    containerView?.footerView?.eventDispatcher = eventDispatcher
-  }
-
-  override fun viewControllerDidPresent(index: Int, position: Float, detent: Float) {
-    val surfaceId = UIManagerHelper.getSurfaceId(this)
-    eventDispatcher?.dispatchEvent(DidPresentEvent(surfaceId, id, index, position, detent))
-  }
-
-  override fun viewControllerWillDismiss() {
-    val surfaceId = UIManagerHelper.getSurfaceId(this)
-    eventDispatcher?.dispatchEvent(WillDismissEvent(surfaceId, id))
-
-    // Disable touch event dispatching
-    viewController.eventDispatcher = null
-    containerView?.footerView?.eventDispatcher = null
-  }
-
-  override fun viewControllerDidDismiss(hadParent: Boolean) {
-    val surfaceId = UIManagerHelper.getSurfaceId(this)
-    eventDispatcher?.dispatchEvent(DidDismissEvent(surfaceId, id))
-
-    TrueSheetDialogObserver.onSheetDidDismiss(this, hadParent)
-  }
-
-  override fun viewControllerDidChangeDetent(index: Int, position: Float, detent: Float) {
-    val surfaceId = UIManagerHelper.getSurfaceId(this)
-    eventDispatcher?.dispatchEvent(DetentChangeEvent(surfaceId, id, index, position, detent))
-  }
-
-  override fun viewControllerDidDragBegin(index: Int, position: Float, detent: Float) {
-    val surfaceId = UIManagerHelper.getSurfaceId(this)
-    eventDispatcher?.dispatchEvent(DragBeginEvent(surfaceId, id, index, position, detent))
-  }
-
-  override fun viewControllerDidDragChange(index: Int, position: Float, detent: Float) {
-    val surfaceId = UIManagerHelper.getSurfaceId(this)
-    eventDispatcher?.dispatchEvent(DragChangeEvent(surfaceId, id, index, position, detent))
-  }
-
-  override fun viewControllerDidDragEnd(index: Int, position: Float, detent: Float) {
-    val surfaceId = UIManagerHelper.getSurfaceId(this)
-    eventDispatcher?.dispatchEvent(DragEndEvent(surfaceId, id, index, position, detent))
-  }
-
-  override fun viewControllerDidChangePosition(index: Float, position: Float, detent: Float, realtime: Boolean) {
-    val surfaceId = UIManagerHelper.getSurfaceId(this)
-    eventDispatcher?.dispatchEvent(PositionChangeEvent(surfaceId, id, index, position, detent, realtime))
-  }
-
-  override fun viewControllerDidChangeSize(width: Int, height: Int) {
-    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))
-  }
+  fun onDropInstance() {
+    reactContext.removeLifecycleEventListener(this)
+    TrueSheetModule.unregisterView(id)
+    TrueSheetDialogObserver.removeSheet(this)
 
-  override fun viewControllerDidBlur() {
-    val surfaceId = UIManagerHelper.getSurfaceId(this)
-    eventDispatcher?.dispatchEvent(BlurEvent(surfaceId, id))
+    if (viewController.isPresented) {
+      viewController.dismiss()
+    }
+    viewController.delegate = null
   }
 
-  override fun viewControllerDidBackPress() {
-    val surfaceId = UIManagerHelper.getSurfaceId(this)
-    eventDispatcher?.dispatchEvent(BackPressEvent(surfaceId, id))
+  /**
+   * Called by the ViewManager after all properties are set.
+   * Reconfigures the sheet if it's currently presented.
+   */
+  fun finalizeUpdates() {
+    if (viewController.isPresented) {
+      viewController.setupBackground()
+      viewController.setupGrabber()
+      updateSheetIfNeeded()
+    }
   }
 
-  // ==================== Property Setters (forward to controller) ====================
+  // ==================== Property Setters ====================
 
   fun setMaxHeight(height: Int) {
     if (viewController.maxSheetHeight == height) return
@@ -293,6 +218,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   fun setDetents(newDetents: MutableList<Double>) {
     viewController.detents = newDetents
   }
+
   fun setEdgeToEdgeFullScreen(edgeToEdgeFullScreen: Boolean) {
     viewController.edgeToEdgeFullScreen = edgeToEdgeFullScreen
   }
@@ -305,6 +231,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
 
   /**
    * Updates the Fabric state with container dimensions for Yoga layout.
+   * Converts pixel values to density-independent pixels (dp).
    */
   fun updateState(width: Int, height: Int) {
     if (width == lastContainerWidth && height == lastContainerHeight) return
@@ -319,9 +246,12 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     sw.updateState(newStateData)
   }
 
+  // ==================== Sheet Actions ====================
+
   @UiThread
   fun present(detentIndex: Int, animated: Boolean = true, promiseCallback: () -> Unit) {
     if (!viewController.isPresented) {
+      // Register with observer to track sheet stack hierarchy
       viewController.parentSheetView = TrueSheetDialogObserver.onSheetWillPresent(this, detentIndex)
     }
     viewController.presentPromise = promiseCallback
@@ -359,10 +289,19 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
 
   /**
    * Debounced sheet update to handle rapid content/header size changes.
-   * Uses post to ensure all layout passes complete before reconfiguring.
+   * Uses post() to ensure all layout passes complete before reconfiguring.
    */
   fun updateSheetIfNeeded() {
-    if (!viewController.isPresented) return
+    if (!viewController.isPresented) {
+      // Handle initial present if pending
+      if (pendingInitialPresent) {
+        viewController.setupSheetDetents()
+        present(initialDetentIndex, initialDetentAnimated) { }
+        pendingInitialPresent = false
+      }
+      return
+    }
+
     if (isSheetUpdatePending) return
 
     isSheetUpdatePending = true
@@ -373,25 +312,12 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     }
   }
 
-  // ==================== TrueSheetContainerViewDelegate Implementation ====================
-
-  override fun containerViewContentDidChangeSize(width: Int, height: Int) {
-    updateSheetIfNeeded()
-  }
-
-  override fun containerViewHeaderDidChangeSize(width: Int, height: Int) {
-    updateSheetIfNeeded()
-  }
-
-  override fun containerViewFooterDidChangeSize(width: Int, height: Int) {
-    viewController.positionFooter()
-  }
-
-  // ==================== Stack Translation ====================
+  // ==================== Sheet Stack Translation ====================
 
   /**
-   * Updates this sheet's translation based on its direct child's position.
-   * Propagates additional translation to parent so it stays behind this sheet.
+   * Updates this sheet's translation based on its child sheet's position.
+   * When a child sheet is presented, parent sheets slide down to create a stacked appearance.
+   * Propagates additional translation to parent so the entire stack stays visually consistent.
    */
   fun updateTranslationForChild(childSheetTop: Int) {
     if (!viewController.isDialogVisible || viewController.isExpanded) return
@@ -402,13 +328,14 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
 
     viewController.translateDialog(newTranslation)
 
+    // Propagate any additional translation up the stack
     if (additionalTranslation > 0) {
       TrueSheetDialogObserver.getParentSheet(this)?.addTranslation(additionalTranslation)
     }
   }
 
   /**
-   * Adds translation to this sheet and propagates to parent.
+   * Recursively adds translation to this sheet and all parent sheets.
    */
   private fun addTranslation(amount: Int) {
     if (!viewController.isDialogVisible || viewController.isExpanded) return
@@ -417,7 +344,104 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     TrueSheetDialogObserver.getParentSheet(this)?.addTranslation(amount)
   }
 
-  companion object {
-    const val TAG_NAME = "TrueSheet"
+  // ==================== TrueSheetViewControllerDelegate ====================
+
+  override fun viewControllerWillPresent(index: Int, position: Float, detent: Float) {
+    val surfaceId = UIManagerHelper.getSurfaceId(this)
+    eventDispatcher?.dispatchEvent(WillPresentEvent(surfaceId, id, index, position, detent))
+
+    // Enable touch event dispatching to React Native while sheet is visible
+    viewController.eventDispatcher = eventDispatcher
+    containerView?.footerView?.eventDispatcher = eventDispatcher
+  }
+
+  override fun viewControllerDidPresent(index: Int, position: Float, detent: Float) {
+    val surfaceId = UIManagerHelper.getSurfaceId(this)
+    eventDispatcher?.dispatchEvent(DidPresentEvent(surfaceId, id, index, position, detent))
+  }
+
+  override fun viewControllerWillDismiss() {
+    val surfaceId = UIManagerHelper.getSurfaceId(this)
+    eventDispatcher?.dispatchEvent(WillDismissEvent(surfaceId, id))
+
+    // Disable touch event dispatching when sheet is dismissing
+    viewController.eventDispatcher = null
+    containerView?.footerView?.eventDispatcher = null
+  }
+
+  override fun viewControllerDidDismiss(hadParent: Boolean) {
+    val surfaceId = UIManagerHelper.getSurfaceId(this)
+    eventDispatcher?.dispatchEvent(DidDismissEvent(surfaceId, id))
+
+    TrueSheetDialogObserver.onSheetDidDismiss(this, hadParent)
+  }
+
+  override fun viewControllerDidChangeDetent(index: Int, position: Float, detent: Float) {
+    val surfaceId = UIManagerHelper.getSurfaceId(this)
+    eventDispatcher?.dispatchEvent(DetentChangeEvent(surfaceId, id, index, position, detent))
+  }
+
+  override fun viewControllerDidDragBegin(index: Int, position: Float, detent: Float) {
+    val surfaceId = UIManagerHelper.getSurfaceId(this)
+    eventDispatcher?.dispatchEvent(DragBeginEvent(surfaceId, id, index, position, detent))
+  }
+
+  override fun viewControllerDidDragChange(index: Int, position: Float, detent: Float) {
+    val surfaceId = UIManagerHelper.getSurfaceId(this)
+    eventDispatcher?.dispatchEvent(DragChangeEvent(surfaceId, id, index, position, detent))
+  }
+
+  override fun viewControllerDidDragEnd(index: Int, position: Float, detent: Float) {
+    val surfaceId = UIManagerHelper.getSurfaceId(this)
+    eventDispatcher?.dispatchEvent(DragEndEvent(surfaceId, id, index, position, detent))
+  }
+
+  override fun viewControllerDidChangePosition(index: Float, position: Float, detent: Float, realtime: Boolean) {
+    val surfaceId = UIManagerHelper.getSurfaceId(this)
+    eventDispatcher?.dispatchEvent(PositionChangeEvent(surfaceId, id, index, position, detent, realtime))
+  }
+
+  override fun viewControllerDidChangeSize(width: Int, height: Int) {
+    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))
+  }
+
+  override fun viewControllerDidBackPress() {
+    val surfaceId = UIManagerHelper.getSurfaceId(this)
+    eventDispatcher?.dispatchEvent(BackPressEvent(surfaceId, id))
+  }
+
+  // ==================== TrueSheetContainerViewDelegate ====================
+
+  override fun containerViewContentDidChangeSize(width: Int, height: Int) {
+    updateSheetIfNeeded()
+  }
+
+  override fun containerViewHeaderDidChangeSize(width: Int, height: Int) {
+    updateSheetIfNeeded()
+  }
+
+  override fun containerViewFooterDidChangeSize(width: Int, height: Int) {
+    // Footer changes don't affect detents, only reposition it
+    viewController.positionFooter()
   }
 }