@lodev09/react-native-true-sheet 3.1.0-beta.5 → 3.1.0-beta.6

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

@@ -157,15 +157,15 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   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))
-
-    // Enable touch event dispatching to React Native
-    viewController.eventDispatcher = eventDispatcher
-    containerView?.footerView?.eventDispatcher = eventDispatcher
   }
 
   override fun viewControllerWillDismiss() {

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

@@ -66,6 +66,10 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     private const val GRABBER_TAG = "TrueSheetGrabber"
     private const val DEFAULT_MAX_WIDTH = 640 // dp
     private const val DEFAULT_CORNER_RADIUS = 16 // dp
+
+    // Animation durations from res/anim/true_sheet_slide_in.xml and true_sheet_slide_out.xml
+    private const val PRESENT_ANIMATION_DURATION = 200L
+    private const val DISMISS_ANIMATION_DURATION = 150L
   }
 
   // ====================================================================
@@ -115,6 +119,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   private val resolvedDetentPositions = mutableListOf<Int>()
 
   private var isDragging = false
+  private var isDismissing = false
   private var isReconfiguring = false
   private var windowAnimation: Int = 0
   private var lastEmittedPositionPx: Int = -1
@@ -272,6 +277,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
     dialog = null
     isDragging = false
+    isDismissing = false
     isPresented = false
     isDialogVisible = false
     lastEmittedPositionPx = -1
@@ -286,43 +292,51 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       setupGrabber()
 
       sheetContainer?.post {
-        val detentInfo = getDetentInfoForIndex(currentDetentIndex)
-        val detent = getDetentValueForIndex(detentInfo.index)
         val positionPx = bottomSheetView?.let { ScreenUtils.getScreenY(it) } ?: screenHeight
 
-        delegate?.viewControllerDidPresent(detentInfo.index, detentInfo.position, detent)
-
         // Store resolved position for initial detent
-        storeResolvedPosition(detentInfo.index)
+        storeResolvedPosition(currentDetentIndex)
         emitChangePositionDelegate(positionPx, realtime = false)
 
+        positionFooter()
+      }
+
+      // Emit didPresent/didFocus after present animation completes
+      sheetContainer?.postDelayed({
+        val detentInfo = getDetentInfoForIndex(currentDetentIndex)
+        val detent = getDetentValueForIndex(detentInfo.index)
+
+        delegate?.viewControllerDidPresent(detentInfo.index, detentInfo.position, detent)
+
         // Notify parent sheet that it has lost focus (after this sheet appeared)
         parentSheetView?.viewControllerDidBlur()
 
+        // Emit didFocus with didPresent
+        delegate?.viewControllerDidFocus()
+
         presentPromise?.invoke()
         presentPromise = null
-
-        positionFooter()
-      }
+      }, PRESENT_ANIMATION_DURATION)
     }
 
     dialog.setOnCancelListener {
-      delegate?.viewControllerWillDismiss()
+      // Skip if already handled by STATE_HIDDEN (programmatic dismiss)
+      if (isDismissing) return@setOnCancelListener
 
-      // Notify parent sheet that it is about to regain focus
-      parentSheetView?.viewControllerWillFocus()
-    }
+      // User-initiated dismiss (back button, tap outside)
+      isDismissing = true
+      emitWillDismissEvents()
 
-    dialog.setOnDismissListener {
-      val hadParent = parentSheetView != null
+      // Emit off-screen position since onSlide isn't triggered for user-initiated dismiss
+      emitChangePositionDelegate(screenHeight, realtime = false)
 
-      // Notify parent sheet that it has regained focus
-      parentSheetView?.viewControllerDidFocus()
-      parentSheetView = null
+      // Emit didBlur/didDismiss after dismiss animation completes
+      android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
+        emitDidDismissEvents()
+      }, DISMISS_ANIMATION_DURATION)
+    }
 
-      dismissPromise?.invoke()
-      dismissPromise = null
-      delegate?.viewControllerDidDismiss(hadParent)
+    dialog.setOnDismissListener {
       cleanupDialog()
     }
   }
@@ -348,7 +362,10 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
         override fun onStateChanged(sheetView: View, newState: Int) {
           if (newState == BottomSheetBehavior.STATE_HIDDEN) {
-            dismiss()
+            // Mark as dismissing so setOnCancelListener skips emitting events
+            isDismissing = true
+            emitDidDismissEvents()
+            dialog.dismiss()
             return
           }
 
@@ -433,6 +450,34 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     rnScreensObserver = null
   }
 
+  // ====================================================================
+  // MARK: - Dismiss Event Helpers
+  // ====================================================================
+
+  /**
+   * Emits willBlur and willDismiss events, and notifies parent sheet of upcoming focus change.
+   */
+  private fun emitWillDismissEvents() {
+    delegate?.viewControllerWillBlur()
+    delegate?.viewControllerWillDismiss()
+    parentSheetView?.viewControllerWillFocus()
+  }
+
+  /**
+   * Emits didBlur and didDismiss events, notifies parent sheet, and invokes dismiss promise.
+   */
+  private fun emitDidDismissEvents() {
+    val hadParent = parentSheetView != null
+    parentSheetView?.viewControllerDidFocus()
+    parentSheetView = null
+
+    delegate?.viewControllerDidBlur()
+    delegate?.viewControllerDidDismiss(hadParent)
+
+    dismissPromise?.invoke()
+    dismissPromise = null
+  }
+
   // ====================================================================
   // MARK: - Dialog Visibility (for stacking)
   // ====================================================================
@@ -518,6 +563,9 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
       delegate?.viewControllerWillPresent(detentInfo.index, detentInfo.position, detent)
 
+      // Emit willFocus with willPresent
+      delegate?.viewControllerWillFocus()
+
       if (!animated) {
         dialog.window?.setWindowAnimations(0)
       }
@@ -527,15 +575,20 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   }
 
   fun dismiss(animated: Boolean = true) {
+    emitWillDismissEvents()
+
     this.post {
       // Emit off-screen position (detent = 0 since sheet is fully hidden)
       emitChangePositionDelegate(screenHeight, realtime = false)
     }
 
-    dialog?.apply {
-      if (!animated) window?.setWindowAnimations(0)
-      post { dismiss() }
+    if (!animated) {
+      dialog?.window?.setWindowAnimations(0)
     }
+
+    // Temporarily enable hideable to allow STATE_HIDDEN transition
+    behavior?.isHideable = true
+    behavior?.state = BottomSheetBehavior.STATE_HIDDEN
   }
 
   // ====================================================================

package/ios/TrueSheetViewController.mm

@@ -159,15 +159,20 @@
       }
     }
 
-    if ([self.delegate respondsToSelector:@selector(viewControllerWillPresentAtIndex:position:detent:)]) {
-      dispatch_async(dispatch_get_main_queue(), ^{
+    dispatch_async(dispatch_get_main_queue(), ^{
+      if ([self.delegate respondsToSelector:@selector(viewControllerWillPresentAtIndex:position:detent:)]) {
         NSInteger index = self.currentDetentIndex;
         CGFloat position = self.currentPosition;
         CGFloat detent = [self detentValueForIndex:index];
 
         [self.delegate viewControllerWillPresentAtIndex:index position:position detent:detent];
-      });
-    }
+      }
+
+      // Emit willFocus with willPresent
+      if ([self.delegate respondsToSelector:@selector(viewControllerWillFocus)]) {
+        [self.delegate viewControllerWillFocus];
+      }
+    });
   }
 
   [self setupTransitionTracker];
@@ -184,13 +189,19 @@
       }
     }
 
-    if ([self.delegate respondsToSelector:@selector(viewControllerDidPresentAtIndex:position:detent:)]) {
-      dispatch_async(dispatch_get_main_queue(), ^{
+    dispatch_async(dispatch_get_main_queue(), ^{
+      if ([self.delegate respondsToSelector:@selector(viewControllerDidPresentAtIndex:position:detent:)]) {
         NSInteger index = [self currentDetentIndex];
         CGFloat detent = [self detentValueForIndex:index];
         [self.delegate viewControllerDidPresentAtIndex:index position:self.currentPosition detent:detent];
-      });
-    }
+      }
+
+      // Emit didFocus with didPresent
+      if ([self.delegate respondsToSelector:@selector(viewControllerDidFocus)]) {
+        [self.delegate viewControllerDidFocus];
+      }
+    });
+
     [self setupGestureRecognizer];
     _isPresented = YES;
   }
@@ -204,9 +215,16 @@
   [super viewWillDisappear:animated];
 
   if (self.isDismissing) {
-    if ([self.delegate respondsToSelector:@selector(viewControllerWillDismiss)]) {
-      [self.delegate viewControllerWillDismiss];
-    }
+    dispatch_async(dispatch_get_main_queue(), ^{
+      // Emit willBlur with willDismiss
+      if ([self.delegate respondsToSelector:@selector(viewControllerWillBlur)]) {
+        [self.delegate viewControllerWillBlur];
+      }
+
+      if ([self.delegate respondsToSelector:@selector(viewControllerWillDismiss)]) {
+        [self.delegate viewControllerWillDismiss];
+      }
+    });
 
     // Notify the parent sheet (if any) that it is about to regain focus
     if (_parentSheetController) {
@@ -235,6 +253,11 @@
       _parentSheetController = nil;
     }
 
+    // Emit didBlur with didDismiss
+    if ([self.delegate respondsToSelector:@selector(viewControllerDidBlur)]) {
+      [self.delegate viewControllerDidBlur];
+    }
+
     if ([self.delegate respondsToSelector:@selector(viewControllerDidDismiss)]) {
       [self.delegate viewControllerDidDismiss];
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lodev09/react-native-true-sheet",
-  "version": "3.1.0-beta.5",
+  "version": "3.1.0-beta.6",
   "description": "The true native bottom sheet experience for your React Native Apps.",
   "source": "./src/index.ts",
   "main": "./lib/module/index.js",
@@ -80,7 +80,7 @@
     "@eslint/js": "^9.35.0",
     "@evilmartians/lefthook": "^2.0.4",
     "@react-native/babel-preset": "^0.82.1",
-    "@react-native/eslint-config": "^0.81.1",
+    "@react-native/eslint-config": "^0.82.1",
     "@release-it/conventional-changelog": "^10.0.1",
     "@testing-library/react-native": "^13.3.3",
     "@types/babel__core": "^7",

package/src/__mocks__/index.js

@@ -6,13 +6,13 @@ export class TrueSheet extends React.Component {
   static instances = {};
 
   // Static methods
-  static dismiss = jest.fn((name) => Promise.resolve());
-  static present = jest.fn((name, index = 0) => Promise.resolve());
+  static dismiss = jest.fn((name, animated = true) => Promise.resolve());
+  static present = jest.fn((name, index = 0, animated = true) => Promise.resolve());
   static resize = jest.fn((name, index) => Promise.resolve());
 
   // Instance methods
-  dismiss = jest.fn(() => Promise.resolve());
-  present = jest.fn((index = 0) => Promise.resolve());
+  dismiss = jest.fn((animated = true) => Promise.resolve());
+  present = jest.fn((index = 0, animated = true) => Promise.resolve());
   resize = jest.fn((index) => Promise.resolve());
 
   componentDidMount() {
@@ -30,9 +30,10 @@ export class TrueSheet extends React.Component {
   }
 
   render() {
-    const { children, footer, style, ...rest } = this.props;
+    const { children, header, footer, style, ...rest } = this.props;
     return (
       <View style={style} {...rest}>
+        {header}
         {children}
         {footer}
       </View>