@lodev09/react-native-true-sheet 3.7.3 → 3.7.4-beta.1

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

@@ -483,10 +483,6 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     eventDispatcher?.dispatchEvent(BackPressEvent(surfaceId, id))
   }
 
-  override fun viewControllerDidDetectScreenDisappear() {
-    dismissAll(animated = true) {}
-  }
-
   override fun viewControllerDidDetectScreenDismiss() {
     resetTranslation()
   }

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

@@ -63,7 +63,6 @@ interface TrueSheetViewControllerDelegate {
   fun viewControllerWillBlur()
   fun viewControllerDidBlur()
   fun viewControllerDidBackPress()
-  fun viewControllerDidDetectScreenDisappear()
   fun viewControllerDidDetectScreenDismiss()
 }
 
@@ -92,7 +91,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
+    private const val SCREEN_FADE_DURATION = 150L
   }
 
   // =============================================================================
@@ -132,7 +131,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
   private var interactionState: InteractionState = InteractionState.Idle
   private var isDismissing = false
-  internal var wasHiddenByModal = false
+  internal var wasHiddenByScreen = false
   private var shouldAnimatePresent = false
   private var isPresentAnimating = false
 
@@ -340,7 +339,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     isDismissing = false
     isPresented = false
     isSheetVisible = false
-    wasHiddenByModal = false
+    wasHiddenByScreen = false
     cachedContentHeight = 0
     cachedHeaderHeight = 0
     isPresentAnimating = false
@@ -568,32 +567,32 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   private fun setupModalObserver() {
     rnScreensObserver = RNScreensFragmentObserver(
       reactContext = reactContext,
-      onModalPresented = {
-        if (isPresented && isSheetVisible && isTopmostSheet) {
-          dismissKeyboard()
-          post { hideForModal() }
+      onScreenPresented = {
+        if (isPresented && isTopmostSheet) {
+          if (isSheetVisible) {
+            dismissKeyboard()
+            post { hideForScreen() }
+          } else {
+            // Sheet is already hidden, just mark it
+            wasHiddenByScreen = true
+          }
         }
       },
-      onModalWillDismiss = {
-        if (isPresented && wasHiddenByModal && isTopmostSheet) {
-          showAfterModal()
+      onScreenWillDismiss = {
+        val hasPushedScreens = rnScreensObserver?.hasPushedScreens == true
+        if (isPresented && wasHiddenByScreen && isTopmostSheet && !hasPushedScreens) {
+          showAfterScreen()
           delegate?.viewControllerDidDetectScreenDismiss()
         }
       },
-      onModalDidDismiss = {
-        if (isPresented && wasHiddenByModal) {
-          wasHiddenByModal = false
+      onScreenDidDismiss = {
+        if (isPresented && wasHiddenByScreen) {
+          wasHiddenByScreen = false
           // Restore parent sheet after this sheet is restored
           parentSheetView?.viewController?.let { parent ->
-            post { parent.showAfterModal() }
+            post { parent.showAfterScreen() }
           }
         }
-      },
-      onNonModalScreenPushed = {
-        // Only handle on root sheet (no parent) to trigger dismissAll
-        if (isPresented && isSheetVisible && parentSheetView == null) {
-          delegate?.viewControllerDidDetectScreenDisappear()
-        }
       }
     )
     rnScreensObserver?.start()
@@ -609,29 +608,29 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     dimViews.forEach { it.visibility = if (visible) VISIBLE else INVISIBLE }
   }
 
-  private fun hideForModal() {
+  private fun hideForScreen() {
     val sheet = sheetView ?: run {
-      RNLog.e(reactContext, "TrueSheet: sheetView is null in hideForModal")
+      RNLog.e(reactContext, "TrueSheet: sheetView is null in hideForScreen")
       return
     }
 
     isSheetVisible = false
-    wasHiddenByModal = true
+    wasHiddenByScreen = true
 
-    dimViews.forEach { it.animate().alpha(0f).setDuration(MODAL_FADE_DURATION).start() }
+    dimViews.forEach { it.animate().alpha(0f).setDuration(SCREEN_FADE_DURATION).start() }
     sheet.animate()
       .alpha(0f)
-      .setDuration(MODAL_FADE_DURATION)
+      .setDuration(SCREEN_FADE_DURATION)
       .withEndAction {
         setSheetVisibility(false)
       }
       .start()
 
     // This will hide parent sheets first
-    parentSheetView?.viewController?.hideForModal()
+    parentSheetView?.viewController?.hideForScreen()
   }
 
-  private fun showAfterModal() {
+  private fun showAfterScreen() {
     isSheetVisible = true
     setSheetVisibility(true)
     sheetView?.alpha = 1f
@@ -643,7 +642,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
    * Android may restore visibility on activity resume, so we need to hide it again.
    */
   fun reapplyHiddenState() {
-    if (!wasHiddenByModal) return
+    if (!wasHiddenByScreen) return
     setSheetVisibility(false)
   }
 
@@ -954,7 +953,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   // =============================================================================
 
   private fun shouldHandleKeyboard(checkFocus: Boolean = true): Boolean {
-    if (wasHiddenByModal) return false
+    if (wasHiddenByScreen) return false
     if (!isTopmostSheet) return false
     if (checkFocus && !isFocusedViewWithinSheet()) return false
     return true

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

@@ -7,27 +7,30 @@ 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.
+ * Observes fragment lifecycle to detect react-native-screens screen presentation.
+ * Automatically notifies when screens (modals or pushed) are presented/dismissed.
  */
 class RNScreensFragmentObserver(
   private val reactContext: ReactContext,
-  private val onModalPresented: () -> Unit,
-  private val onModalWillDismiss: () -> Unit,
-  private val onModalDidDismiss: () -> Unit,
-  private val onNonModalScreenPushed: () -> Unit
+  private val onScreenPresented: () -> Unit,
+  private val onScreenWillDismiss: () -> Unit,
+  private val onScreenDidDismiss: () -> Unit
 ) {
   private var fragmentLifecycleCallback: FragmentManager.FragmentLifecycleCallbacks? = null
   private var activityLifecycleObserver: DefaultLifecycleObserver? = null
   private val activeModalFragments: MutableSet<Fragment> = mutableSetOf()
+  private val activePushedFragments: MutableSet<Fragment> = mutableSetOf()
   private var isActivityInForeground = true
   private var pendingDismissRunnable: Runnable? = null
+  private var pendingPopRunnable: Runnable? = null
   private var isInitialized = false
 
+  val hasPushedScreens: Boolean
+    get() = activePushedFragments.isNotEmpty()
+
   /**
    * Start observing fragment lifecycle events.
    */
@@ -64,11 +67,22 @@ class RNScreensFragmentObserver(
           activeModalFragments.add(f)
 
           if (activeModalFragments.size == 1) {
-            onModalPresented()
+            onScreenPresented()
+          }
+        } else if (activeModalFragments.isEmpty() && pendingDismissRunnable == null && isNonModalScreenFragment(f)) {
+          // Check if this is a new push or just re-attaching during pop
+          val isPendingPop = pendingPopRunnable != null
+
+          if (isPendingPop) {
+            // Screen is being re-attached during pop transition, ignore it
+            return
+          }
+
+          activePushedFragments.add(f)
+
+          if (activePushedFragments.size == 1) {
+            onScreenPresented()
           }
-        } else if (activeModalFragments.isEmpty() && isNonModalScreenFragment(f)) {
-          // Only trigger non-modal push when no modals are active
-          onNonModalScreenPushed()
         }
       }
 
@@ -86,14 +100,24 @@ class RNScreensFragmentObserver(
             // Post dismiss to allow fragment attach to cancel if navigation is happening
             schedulePendingDismiss()
           }
+        } else if (activePushedFragments.contains(f) && f.isRemoving) {
+          activePushedFragments.remove(f)
+
+          if (activePushedFragments.isEmpty()) {
+            schedulePendingPop()
+          }
         }
       }
 
       override fun onFragmentDestroyed(fm: FragmentManager, f: Fragment) {
         super.onFragmentDestroyed(fm, f)
 
-        if (activeModalFragments.isEmpty() && pendingDismissRunnable == null) {
-          onModalDidDismiss()
+        if (activeModalFragments.isEmpty() &&
+          activePushedFragments.isEmpty() &&
+          pendingDismissRunnable == null &&
+          pendingPopRunnable == null
+        ) {
+          onScreenDidDismiss()
         }
       }
     }
@@ -113,6 +137,7 @@ class RNScreensFragmentObserver(
     val activity = reactContext.currentActivity as? AppCompatActivity
 
     cancelPendingDismiss()
+    cancelPendingPop()
 
     fragmentLifecycleCallback?.let { callback ->
       activity?.supportFragmentManager?.unregisterFragmentLifecycleCallbacks(callback)
@@ -125,6 +150,7 @@ class RNScreensFragmentObserver(
     activityLifecycleObserver = null
 
     activeModalFragments.clear()
+    activePushedFragments.clear()
   }
 
   private fun schedulePendingDismiss() {
@@ -136,7 +162,7 @@ class RNScreensFragmentObserver(
     pendingDismissRunnable = Runnable {
       pendingDismissRunnable = null
       if (activeModalFragments.isEmpty()) {
-        onModalWillDismiss()
+        onScreenWillDismiss()
       }
     }
     decorView.post(pendingDismissRunnable)
@@ -152,6 +178,31 @@ class RNScreensFragmentObserver(
     }
   }
 
+  private fun schedulePendingPop() {
+    val activity = reactContext.currentActivity ?: return
+    val decorView = activity.window?.decorView ?: return
+
+    cancelPendingPop()
+
+    pendingPopRunnable = Runnable {
+      pendingPopRunnable = null
+      if (activePushedFragments.isEmpty()) {
+        onScreenWillDismiss()
+      }
+    }
+    decorView.post(pendingPopRunnable)
+  }
+
+  private fun cancelPendingPop() {
+    val activity = reactContext.currentActivity ?: return
+    val decorView = activity.window?.decorView ?: return
+
+    pendingPopRunnable?.let {
+      decorView.removeCallbacks(it)
+      pendingPopRunnable = null
+    }
+  }
+
   companion object {
     /**
      * Check if fragment is from react-native-screens.

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

@@ -166,7 +166,7 @@ object TrueSheetStackManager {
       while (true) {
         val parent = current.viewController.parentSheetView ?: return current
 
-        if (parent.viewController.wasHiddenByModal) {
+        if (parent.viewController.wasHiddenByScreen) {
           return current
         }
 

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetViewComponentDescriptor.h

@@ -18,6 +18,10 @@ class TrueSheetViewComponentDescriptor final
     concreteShadowNode.adjustLayoutWithState();
 
     ConcreteComponentDescriptor::adopt(shadowNode);
+
+#if !defined(ANDROID)
+    concreteShadowNode.setEventDispatcher(eventDispatcher_);
+#endif
   }
 };
 

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetViewShadowNode.cpp

@@ -45,4 +45,17 @@ void TrueSheetViewShadowNode::adjustLayoutWithState() {
   }
 }
 
+#if !defined(ANDROID)
+void TrueSheetViewShadowNode::setEventDispatcher(
+    std::weak_ptr<const EventDispatcher> dispatcher) {
+  getStateDataMutable().setEventDispatcher(dispatcher);
+}
+
+TrueSheetViewShadowNode::StateData &
+TrueSheetViewShadowNode::getStateDataMutable() {
+  ensureUnsealed();
+  return const_cast<TrueSheetViewShadowNode::StateData &>(getStateData());
+}
+#endif
+
 } // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetViewShadowNode.h

@@ -8,6 +8,8 @@
 
 namespace facebook::react {
 
+class EventDispatcher;
+
 JSI_EXPORT extern const char TrueSheetViewComponentName[];
 
 /*
@@ -22,6 +24,8 @@ class JSI_EXPORT TrueSheetViewShadowNode final
   using ConcreteViewShadowNode::ConcreteViewShadowNode;
 
  public:
+  using StateData = ConcreteViewShadowNode::ConcreteStateData;
+
   static ShadowNodeTraits BaseTraits() {
     auto traits = ConcreteViewShadowNode::BaseTraits();
     traits.set(ShadowNodeTraits::Trait::RootNodeKind);
@@ -29,6 +33,13 @@ class JSI_EXPORT TrueSheetViewShadowNode final
   }
 
   void adjustLayoutWithState();
+
+#if !defined(ANDROID)
+  void setEventDispatcher(std::weak_ptr<const EventDispatcher> dispatcher);
+
+ private:
+  StateData &getStateDataMutable();
+#endif
 };
 
 } // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetViewState.cpp

@@ -8,4 +8,16 @@ folly::dynamic TrueSheetViewState::getDynamic() const {
 }
 #endif
 
+#if !defined(ANDROID)
+void TrueSheetViewState::setEventDispatcher(
+    std::weak_ptr<const EventDispatcher> dispatcher) {
+  eventDispatcher_ = dispatcher;
+}
+
+std::weak_ptr<const EventDispatcher> TrueSheetViewState::getEventDispatcher()
+    const noexcept {
+  return eventDispatcher_;
+}
+#endif
+
 } // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetViewState.h

@@ -10,6 +10,8 @@
 
 namespace facebook::react {
 
+class EventDispatcher;
+
 /*
  * State for <TrueSheetView> component.
  * Contains the container dimensions from native.
@@ -37,6 +39,14 @@ class TrueSheetViewState final {
     return MapBufferBuilder::EMPTY();
   }
 #endif
+
+#if !defined(ANDROID)
+  void setEventDispatcher(std::weak_ptr<const EventDispatcher> dispatcher);
+  std::weak_ptr<const EventDispatcher> getEventDispatcher() const noexcept;
+
+ private:
+  std::weak_ptr<const EventDispatcher> eventDispatcher_;
+#endif
 };
 
 } // namespace facebook::react

package/ios/TrueSheetContainerView.mm

@@ -79,7 +79,7 @@ using namespace facebook::react;
 
 - (void)setupContentScrollViewPinning {
   if (_scrollViewPinningSet && _contentView) {
-    [_contentView setupScrollViewPinning:_scrollViewPinningEnabled withHeaderView:_headerView];
+    [_contentView setupScrollViewPinning:_scrollViewPinningEnabled];
   }
 }
 
@@ -104,10 +104,6 @@ using namespace facebook::react;
     }
     _headerView = (TrueSheetHeaderView *)childComponentView;
     _headerView.delegate = self;
-
-    if (_contentView) {
-      [self setupContentScrollViewPinning];
-    }
     [self headerViewDidChangeSize:_headerView.frame.size];
   }
 
@@ -129,10 +125,6 @@ using namespace facebook::react;
   if ([childComponentView isKindOfClass:[TrueSheetHeaderView class]]) {
     _headerView.delegate = nil;
     _headerView = nil;
-
-    if (_contentView) {
-      [self setupContentScrollViewPinning];
-    }
     [self headerViewDidChangeSize:CGSizeZero];
   }
 
@@ -150,21 +142,21 @@ using namespace facebook::react;
 #pragma mark - TrueSheetContentViewDelegate
 
 - (void)contentViewDidChangeSize:(CGSize)newSize {
-  if ([self.delegate respondsToSelector:@selector(containerViewContentDidChangeSize:)]) {
-    [self.delegate containerViewContentDidChangeSize:newSize];
-  }
+  [self.delegate containerViewContentDidChangeSize:newSize];
 }
 
 - (void)contentViewDidChangeChildren {
   [self setupContentScrollViewPinning];
 }
 
+- (void)contentViewDidChangeInsets {
+  [self setupContentScrollViewPinning];
+}
+
 #pragma mark - TrueSheetHeaderViewDelegate
 
 - (void)headerViewDidChangeSize:(CGSize)newSize {
-  if ([self.delegate respondsToSelector:@selector(containerViewHeaderDidChangeSize:)]) {
-    [self.delegate containerViewHeaderDidChangeSize:newSize];
-  }
+  [self.delegate containerViewHeaderDidChangeSize:newSize];
 }
 
 #pragma mark - Keyboard Handling

package/ios/TrueSheetContentView.h

@@ -22,6 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)contentViewDidChangeSize:(CGSize)newSize;
 - (void)contentViewDidChangeChildren;
+- (void)contentViewDidChangeInsets;
 
 @end
 
@@ -34,9 +35,8 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * Setup ScrollView pinning
  * @param pinned Whether to pin the scroll view
- * @param headerView Optional header view to pin below (can be nil)
  */
-- (void)setupScrollViewPinning:(BOOL)pinned withHeaderView:(nullable UIView *)headerView;
+- (void)setupScrollViewPinning:(BOOL)pinned;
 
 @end