@lodev09/react-native-true-sheet 3.9.0-beta.3 → 3.9.0-beta.5

package/README.md

@@ -28,7 +28,7 @@ The true native bottom sheet experience for your React Native Apps. 💩
 
 ### Prerequisites
 
-- React Native 0.80+
+- React Native 0.81+
 - New Architecture enabled
 - Xcode 26.1+
 
@@ -36,7 +36,7 @@ The true native bottom sheet experience for your React Native Apps. 💩
 
 | TrueSheet | React Native | Expo SDK |
 |-----------|--------------|----------|
-| 3.7+      | 0.80+        | 54+      |
+| 3.7+      | 0.81+        | 54+      |
 | 3.6       | 0.79         | 52-53    |
 
 ### Expo

package/android/build.gradle

@@ -96,10 +96,11 @@ repositories {
 }
 
 def kotlin_version = getExtOrDefault("kotlinVersion")
+def material_version = getExtOrDefault("materialVersion") ?: "1.12.0"
 
 dependencies {
   implementation "com.facebook.react:react-android"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "com.google.android.material:material:1.12.0"
+  implementation "com.google.android.material:material:$material_version"
 }
 

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

@@ -10,6 +10,7 @@ import com.facebook.react.views.view.ReactViewGroup
 interface TrueSheetContainerViewDelegate {
   val eventDispatcher: EventDispatcher?
   fun containerViewContentDidChangeSize(width: Int, height: Int)
+  fun containerViewContentDidScroll()
   fun containerViewHeaderDidChangeSize(width: Int, height: Int)
   fun containerViewFooterDidChangeSize(width: Int, height: Int)
 }
@@ -119,6 +120,10 @@ class TrueSheetContainerView(reactContext: ThemedReactContext) :
     delegate?.containerViewContentDidChangeSize(width, height)
   }
 
+  override fun contentViewDidScroll() {
+    delegate?.containerViewContentDidScroll()
+  }
+
   override fun headerViewDidChangeSize(width: Int, height: Int) {
     headerHeight = height
     delegate?.containerViewHeaderDidChangeSize(width, height)

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

@@ -10,12 +10,14 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.views.view.ReactViewGroup
 import com.lodev09.truesheet.core.TrueSheetKeyboardObserver
 import com.lodev09.truesheet.core.TrueSheetKeyboardObserverDelegate
+import com.lodev09.truesheet.utils.isDescendantOf
 
 /**
  * Delegate interface for content view size changes
  */
 interface TrueSheetContentViewDelegate {
   fun contentViewDidChangeSize(width: Int, height: Int)
+  fun contentViewDidScroll()
 }
 
 /**
@@ -30,6 +32,7 @@ class TrueSheetContentView(private val reactContext: ThemedReactContext) : React
   private var lastHeight = 0
 
   private var pinnedScrollView: ScrollView? = null
+  private var cachedScrollView: ScrollView? = null
   private var originalScrollViewPaddingBottom: Int = 0
   private var bottomInset: Int = 0
 
@@ -66,7 +69,8 @@ class TrueSheetContentView(private val reactContext: ThemedReactContext) : React
     val scrollView = findScrollView(this)
 
     if (scrollView != pinnedScrollView) {
-      // Restore previous scroll view's padding
+      // Clean up previous scroll view
+      pinnedScrollView?.setOnScrollChangeListener(null as View.OnScrollChangeListener?)
       pinnedScrollView?.setPadding(
         pinnedScrollView!!.paddingLeft,
         pinnedScrollView!!.paddingTop,
@@ -76,6 +80,12 @@ class TrueSheetContentView(private val reactContext: ThemedReactContext) : React
 
       pinnedScrollView = scrollView
       originalScrollViewPaddingBottom = scrollView?.paddingBottom ?: 0
+
+      scrollView?.setOnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
+        if (scrollY != oldScrollY) {
+          delegate?.contentViewDidScroll()
+        }
+      }
     }
 
     scrollView?.let {
@@ -90,6 +100,7 @@ class TrueSheetContentView(private val reactContext: ThemedReactContext) : React
   }
 
   fun clearScrollable() {
+    pinnedScrollView?.setOnScrollChangeListener(null as View.OnScrollChangeListener?)
     pinnedScrollView?.setPadding(
       pinnedScrollView!!.paddingLeft,
       pinnedScrollView!!.paddingTop,
@@ -97,11 +108,19 @@ class TrueSheetContentView(private val reactContext: ThemedReactContext) : React
       originalScrollViewPaddingBottom
     )
     pinnedScrollView = null
+    cachedScrollView = null
     originalScrollViewPaddingBottom = 0
     bottomInset = 0
   }
 
-  fun findScrollView(): ScrollView? = findScrollView(this)
+  fun findScrollView(): ScrollView? {
+    // Return cached if still valid (attached and descendant of this view)
+    cachedScrollView?.let {
+      if (it.isAttachedToWindow && it.isDescendantOf(this)) return it
+      cachedScrollView = null
+    }
+    return findScrollView(this as View).also { cachedScrollView = it }
+  }
 
   private fun findScrollView(view: View): ScrollView? {
     if (view is ScrollView) {

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

@@ -45,19 +45,20 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   var initialDetentAnimated: Boolean = true
   private var didInitiallyPresent: Boolean = false
 
+  private var lastContainerWidth: Int = 0
+  private var lastContainerHeight: Int = 0
+
   var stateWrapper: StateWrapper? = null
     set(value) {
+      field = value
+
       // 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) {
+      if (value != null && lastContainerWidth == 0 && lastContainerHeight == 0) {
         updateState(viewController.screenWidth, viewController.screenHeight)
       }
-      field = value
     }
 
-  private var lastContainerWidth: Int = 0
-  private var lastContainerHeight: Int = 0
-
   // Debounce flag to coalesce rapid layout changes into a single sheet update
   private var isSheetUpdatePending: Boolean = false
 
@@ -343,32 +344,49 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
 
   @UiThread
   fun present(detentIndex: Int, animated: Boolean = true, promiseCallback: () -> Unit) {
-    if (!viewController.isPresented) {
-      // Dismiss keyboard if focused view is within a sheet or if target detent will be dimmed
-      val parentSheet = TrueSheetStackManager.getTopmostSheet()
-      val isFocusedViewWithinSheet = parentSheet?.viewController?.isFocusedViewWithinSheet() == true
-      val shouldDismissKeyboard = isFocusedViewWithinSheet || viewController.isDimmedAtDetentIndex(detentIndex)
-      if (KeyboardUtils.isKeyboardVisible(reactContext) && shouldDismissKeyboard) {
-        viewController.saveFocusedView()
-        KeyboardUtils.dismiss(this) {
-          post { present(detentIndex, animated, promiseCallback) }
-        }
-        return
-      }
+    if (viewController.isPresented) {
+      RNLog.w(reactContext, "TrueSheet: sheet is already presented. Use resize() to change detent.")
+      promiseCallback()
+      return
+    }
 
-      // Attach coordinator to the root container
-      rootContainerView = findRootContainerView()
-      viewController.coordinatorLayout?.let { rootContainerView?.addView(it) }
+    if (viewController.coordinatorLayout == null || viewController.sheetView == null) {
+      RNLog.w(reactContext, "TrueSheet: sheet is not ready. Ensure it is mounted before presenting.")
+      promiseCallback()
+      return
+    }
 
-      // Register with observer to track sheet stack hierarchy
-      viewController.parentSheetView = TrueSheetStackManager.registerSheet(this)
+    // Dismiss keyboard if focused view is within a sheet or if target detent will be dimmed
+    val parentSheet = TrueSheetStackManager.getTopmostSheet()
+    val isFocusedViewWithinSheet = parentSheet?.viewController?.isFocusedViewWithinSheet() == true
+    val shouldDismissKeyboard = isFocusedViewWithinSheet || viewController.isDimmedAtDetentIndex(detentIndex)
+    if (KeyboardUtils.isKeyboardVisible(reactContext) && shouldDismissKeyboard) {
+      viewController.saveFocusedView()
+      KeyboardUtils.dismiss(this) {
+        post { present(detentIndex, animated, promiseCallback) }
+      }
+      return
     }
+
+    // Attach coordinator to the root container
+    rootContainerView = findRootContainerView()
+    viewController.coordinatorLayout?.let { rootContainerView?.addView(it) }
+
+    // Register with observer to track sheet stack hierarchy
+    viewController.parentSheetView = TrueSheetStackManager.registerSheet(this)
+
     viewController.presentPromise = promiseCallback
     viewController.present(detentIndex, animated)
   }
 
   @UiThread
   fun dismiss(animated: Boolean = true, promiseCallback: () -> Unit) {
+    if (viewController.isBeingDismissed || !viewController.isPresented) {
+      RNLog.w(reactContext, "TrueSheet: sheet is already dismissed. No need to dismiss it again.")
+      promiseCallback()
+      return
+    }
+
     // Dismiss all sheets above first
     dismissStack(animated) {}
 
@@ -379,20 +397,31 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
 
   @UiThread
   fun dismissStack(animated: Boolean = true, promiseCallback: () -> Unit) {
+    if (viewController.isBeingDismissed || !viewController.isPresented) {
+      RNLog.w(reactContext, "TrueSheet: sheet is already dismissed. No need to dismiss it again.")
+      promiseCallback()
+      return
+    }
+
     val sheetsAbove = TrueSheetStackManager.getSheetsAbove(this)
-    if (sheetsAbove.isNotEmpty()) {
-      // Create snapshot only for topmost sheet (first in reversed list)
-      sheetsAbove.firstOrNull()?.viewController?.createSheetSnapshot()
+    // Create snapshot only for topmost sheet (first in reversed list)
+    sheetsAbove.firstOrNull()?.viewController?.createSheetSnapshot()
 
-      for (sheet in sheetsAbove) {
-        sheet.viewController.dismiss(animated)
-      }
+    for (sheet in sheetsAbove) {
+      sheet.viewController.dismiss(animated)
     }
+
     promiseCallback()
   }
 
   @UiThread
   fun resize(detentIndex: Int, promiseCallback: () -> Unit) {
+    if (!viewController.isPresented) {
+      RNLog.w(reactContext, "TrueSheet: Cannot resize. Sheet is not presented.")
+      promiseCallback()
+      return
+    }
+
     viewController.resizePromise = promiseCallback
     viewController.resize(detentIndex)
   }
@@ -556,6 +585,10 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     updateSheetIfNeeded()
   }
 
+  override fun containerViewContentDidScroll() {
+    viewController.commitKeyboardDetent()
+  }
+
   override fun containerViewHeaderDidChangeSize(width: Int, height: Int) {
     updateSheetIfNeeded()
   }

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

@@ -173,6 +173,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
   // Keyboard State
   private var detentIndexBeforeKeyboard: Int = -1
+  private var isKeyboardDismissProgrammatic = false
   private var focusedViewBeforeBlur: View? = null
 
   // Promises
@@ -212,10 +213,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   var insetAdjustment: TrueSheetInsetAdjustment = TrueSheetInsetAdjustment.AUTOMATIC
 
   var scrollable: Boolean = false
-    set(value) {
-      field = value
-      coordinatorLayout?.scrollable = value
-    }
 
   var scrollableOptions: ReadableMap? = null
 
@@ -344,7 +341,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     // Create coordinator layout
     coordinatorLayout = TrueSheetCoordinatorLayout(reactContext).apply {
       delegate = this@TrueSheetViewController
-      scrollable = this@TrueSheetViewController.scrollable
     }
 
     sheetView = TrueSheetBottomSheetView(reactContext).apply {
@@ -383,6 +379,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     isPresentAnimating = false
     lastEmittedPositionPx = -1
     detentIndexBeforeKeyboard = -1
+    isKeyboardDismissProgrammatic = false
     focusedViewBeforeBlur = null
     shouldAnimatePresent = true
   }
@@ -457,7 +454,9 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     sheetView?.let { emitChangePositionDelegate(it.top, realtime = false) }
   }
 
+  override val isScrollable: Boolean get() = scrollable
   override fun findScrollView(): ScrollView? = containerView?.contentView?.findScrollView()
+  override fun findSheetView(): TrueSheetBottomSheetView? = sheetView
 
   // =============================================================================
   // MARK: - TrueSheetDimViewDelegate
@@ -604,6 +603,10 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
         }
       }
     }
+
+    if (!isKeyboardTransitioning) {
+      updateDimAmount(animated = true)
+    }
   }
 
   // =============================================================================
@@ -658,22 +661,9 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   // =============================================================================
 
   fun present(detentIndex: Int, animated: Boolean = true) {
-    val coordinator = this.coordinatorLayout ?: run {
-      RNLog.w(reactContext, "TrueSheet: No coordinator layout available. Ensure the sheet is mounted before presenting.")
-      return
-    }
-
-    val sheet = this.sheetView ?: run {
-      RNLog.w(reactContext, "TrueSheet: No sheet view available.")
-      return
-    }
-
-    if (isPresented) {
-      RNLog.w(reactContext, "TrueSheet: sheet is already presented. Use resize() to change detent.")
-      presentPromise?.invoke()
-      presentPromise = null
-      return
-    }
+    val coordinator = this.coordinatorLayout ?: return
+    val sheet = this.sheetView ?: return
+    if (isPresented) return
 
     shouldAnimatePresent = animated
     currentDetentIndex = detentIndex
@@ -710,12 +700,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   }
 
   fun resize(detentIndex: Int) {
-    if (!isPresented) {
-      RNLog.w(reactContext, "TrueSheet: Cannot resize. Sheet is not presented.")
-      resizePromise?.invoke()
-      resizePromise = null
-      return
-    }
+    if (!isPresented) return
 
     // Commit the new index so keyboardWillHide restores to it instead of the stale one
     if (detentIndexBeforeKeyboard >= 0) {
@@ -765,6 +750,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   }
 
   private fun dismissKeyboard() {
+    isKeyboardDismissProgrammatic = true
     KeyboardUtils.dismiss(reactContext)
   }
 
@@ -816,7 +802,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   // MARK: - Sheet Configuration
   // =============================================================================
 
-  fun setupSheetDetents() {
+  fun setupSheetDetents(applyState: Boolean = true) {
     val behavior = this.behavior ?: run {
       RNLog.e(reactContext, "TrueSheet: behavior is null in setupSheetDetents")
       return
@@ -861,7 +847,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
 
     updateStateDimensions(expandedOffset)
 
-    if (isPresented) {
+    if (isPresented && applyState) {
       setStateForDetentIndex(currentDetentIndex)
     }
 
@@ -939,8 +925,13 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     if (!dimmed) return
     if (contentHeight == 0) return
 
-    val keyboardOffset = if (isBeingDismissed) 0 else currentKeyboardInset
-    val top = (sheetTop ?: sheetView?.top ?: return) + keyboardOffset
+    // While keyboard is active or transitioning, use the target detent position for dim
+    val top = if (keyboardInset > 0 || isKeyboardTransitioning) {
+      detentCalculator.getSheetTopForDetentIndex(currentDetentIndex)
+    } else {
+      val keyboardOffset = if (isBeingDismissed) 0 else currentKeyboardInset
+      (sheetTop ?: sheetView?.top ?: return) + keyboardOffset
+    }
 
     if (animated) {
       val targetAlpha = dimView?.calculateAlpha(
@@ -1019,27 +1010,47 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
           if (!shouldHandleKeyboard()) return
           detentIndexBeforeKeyboard = currentDetentIndex
           setupSheetDetents()
-          setStateForDetentIndex(detents.size - 1)
+          currentDetentIndex = detents.size - 1
+          setStateForDetentIndex(currentDetentIndex)
+          updateDimAmount(animated = true)
         }
 
         override fun keyboardWillHide() {
           if (!shouldHandleKeyboard(checkFocus = false)) return
-          setupSheetDetents()
-          if (!isBeingDismissed && detentIndexBeforeKeyboard >= 0) {
-            setStateForDetentIndex(detentIndexBeforeKeyboard)
+          val restoring = !isBeingDismissed && detentIndexBeforeKeyboard >= 0
+
+          // Skip reconfigure during interactive keyboard dismiss (e.g. keyboardDismissMode="on-drag")
+          // to prevent the sheet from jumping. keyboardDidHide will reconfigure after.
+          if (restoring || isKeyboardDismissProgrammatic) {
+            setupSheetDetents()
+            if (restoring) {
+              currentDetentIndex = detentIndexBeforeKeyboard
+              setStateForDetentIndex(currentDetentIndex)
+            }
           }
+
+          updateDimAmount(
+            sheetTop = detentCalculator.getSheetTopForDetentIndex(currentDetentIndex),
+            animated = true
+          )
         }
 
         override fun keyboardDidHide() {
           if (!shouldHandleKeyboard(checkFocus = false)) return
           detentIndexBeforeKeyboard = -1
+          isKeyboardDismissProgrammatic = false
+          setupSheetDetents(applyState = false)
           positionFooter()
+          updateDimAmount(
+            sheetTop = detentCalculator.getSheetTopForDetentIndex(currentDetentIndex),
+            animated = true
+          )
         }
 
         override fun keyboardDidChangeHeight(height: Int) {
-          // Skip focus check if already handling keyboard (focus may be lost during hide)
-          val isHandlingKeyboard = detentIndexBeforeKeyboard >= 0
-          if (!shouldHandleKeyboard(checkFocus = !isHandlingKeyboard)) return
+          // Skip focus check during active keyboard transitions (focus may be lost during hide)
+          val skipFocusCheck = detentIndexBeforeKeyboard >= 0 || isKeyboardTransitioning
+          if (!shouldHandleKeyboard(checkFocus = !skipFocusCheck)) return
           positionFooter()
         }
 
@@ -1069,6 +1080,10 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   private fun getPositionDpForView(sheetView: View): Float =
     detentCalculator.getPositionDp(detentCalculator.getVisibleSheetHeight(sheetView.top))
 
+  fun commitKeyboardDetent() {
+    detentIndexBeforeKeyboard = -1
+  }
+
   private fun handleDragBegin(sheetView: View) {
     detentIndexBeforeKeyboard = -1
 

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

@@ -9,11 +9,14 @@ import android.widget.ScrollView
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import com.facebook.react.uimanager.PointerEvents
 import com.facebook.react.uimanager.ReactPointerEventsView
+import com.lodev09.truesheet.utils.isDescendantOf
 
 interface TrueSheetCoordinatorLayoutDelegate {
+  val isScrollable: Boolean
   fun coordinatorLayoutDidLayout(changed: Boolean)
   fun coordinatorLayoutDidChangeConfiguration()
   fun findScrollView(): ScrollView?
+  fun findSheetView(): TrueSheetBottomSheetView?
 }
 
 /**
@@ -27,7 +30,6 @@ class TrueSheetCoordinatorLayout(context: Context) :
   ReactPointerEventsView {
 
   var delegate: TrueSheetCoordinatorLayoutDelegate? = null
-  var scrollable: Boolean = false
 
   private val touchSlop: Int = ViewConfiguration.get(context).scaledTouchSlop
   private var dragging = false
@@ -63,6 +65,29 @@ class TrueSheetCoordinatorLayout(context: Context) :
   override val pointerEvents: PointerEvents
     get() = PointerEvents.BOX_NONE
 
+  /**
+   * Clears stale `nestedScrollingChildRef` from BottomSheetBehavior.
+   *
+   * `BottomSheetBehavior.onLayoutChild` calls `findScrollingChild()` which traverses the
+   * entire sheet subtree. When a child sheet with a ScrollView is dismissed, the ScrollView
+   * returns to this sheet's view hierarchy. `onLayoutChild` may then capture a ref to that
+   * ScrollView even though it doesn't belong to this sheet, blocking drag interactions.
+   */
+  private fun clearStaleNestedScrollingChildRef() {
+    val sheet = delegate?.findSheetView() ?: return
+    val behavior = sheet.behavior ?: return
+    try {
+      val field = behavior.javaClass.getDeclaredField("nestedScrollingChildRef")
+      field.isAccessible = true
+      @Suppress("UNCHECKED_CAST")
+      val ref = field.get(behavior) as? java.lang.ref.WeakReference<android.view.View> ?: return
+      val view = ref.get() ?: return
+      if (!view.isDescendantOf(sheet)) {
+        ref.clear()
+      }
+    } catch (_: Exception) {}
+  }
+
   /**
    * Intercepts touch events for ScrollViews that can't scroll (content < viewport),
    * allowing the sheet to be dragged in these cases.
@@ -71,7 +96,10 @@ class TrueSheetCoordinatorLayout(context: Context) :
    * See: https://github.com/facebook/react-native/pull/44099
    */
   override fun onInterceptTouchEvent(ev: MotionEvent): Boolean {
-    if (!scrollable) {
+    if (delegate?.isScrollable != true) {
+      if (ev.actionMasked == MotionEvent.ACTION_DOWN) {
+        clearStaleNestedScrollingChildRef()
+      }
       return super.onInterceptTouchEvent(ev)
     }
 

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

@@ -64,16 +64,23 @@ class TrueSheetKeyboardObserver(private val targetView: View, private val reactC
   }
 
   fun stop() {
-    globalLayoutListener?.let { listener ->
-      activityRootView?.viewTreeObserver?.removeOnGlobalLayoutListener(listener)
-      globalLayoutListener = null
-    }
-    focusChangeListener?.let { listener ->
-      activityRootView?.viewTreeObserver?.removeOnGlobalFocusChangeListener(listener)
-      focusChangeListener = null
+    try {
+      globalLayoutListener?.let { listener ->
+        activityRootView?.viewTreeObserver?.let { observer ->
+          if (observer.isAlive) observer.removeOnGlobalLayoutListener(listener)
+        }
+        globalLayoutListener = null
+      }
+      focusChangeListener?.let { listener ->
+        activityRootView?.viewTreeObserver?.let { observer ->
+          if (observer.isAlive) observer.removeOnGlobalFocusChangeListener(listener)
+        }
+        focusChangeListener = null
+      }
+    } finally {
+      activityRootView = null
+      ViewCompat.setWindowInsetsAnimationCallback(targetView, null)
     }
-    activityRootView = null
-    ViewCompat.setWindowInsetsAnimationCallback(targetView, null)
   }
 
   private fun updateHeight(from: Int, to: Int, fraction: Float) {

package/android/src/main/java/com/lodev09/truesheet/utils/ViewUtils.kt

@@ -3,6 +3,7 @@ package com.lodev09.truesheet.utils
 import android.view.View
 
 fun View.isDescendantOf(ancestor: View): Boolean {
+  if (!isAttachedToWindow) return false
   var current: View? = this
   while (current != null) {
     if (current === ancestor) return true

package/ios/TrueSheetView.mm

@@ -281,7 +281,7 @@ using namespace facebook::react;
   if (!_state)
     return;
 
-  if (CGSizeEqualToSize(size, _lastStateSize))
+  if (fabs(size.width - _lastStateSize.width) < 0.5 && fabs(size.height - _lastStateSize.height) < 0.5)
     return;
 
   _lastStateSize = size;

package/ios/TrueSheetViewController.mm

@@ -82,6 +82,8 @@ using namespace facebook::react;
 }
 
 - (void)dealloc {
+  [_transitioningTimer invalidate];
+  _transitioningTimer = nil;
   [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
@@ -413,22 +415,32 @@ using namespace facebook::react;
   _transitionFakeView.frame = self.isBeingDismissed ? presentedFrame : dismissedFrame;
   [self storeResolvedPositionForIndex:self.currentDetentIndex];
 
-  auto animation = ^(id<UIViewControllerTransitionCoordinatorContext> _Nonnull context) {
-    [[context containerView] addSubview:self->_transitionFakeView];
-    self->_transitionFakeView.frame = self.isBeingDismissed ? dismissedFrame : presentedFrame;
-
-    self->_transitioningTimer = [CADisplayLink displayLinkWithTarget:self selector:@selector(handleTransitionTracker)];
-    [self->_transitioningTimer addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
-  };
+  __weak __typeof(self) weakSelf = self;
 
   [self.transitionCoordinator
-    animateAlongsideTransition:animation
-                    completion:^(id<UIViewControllerTransitionCoordinatorContext> _Nonnull context) {
-                      [self->_transitioningTimer setPaused:YES];
-                      [self->_transitioningTimer invalidate];
-                      [self->_transitionFakeView removeFromSuperview];
-                      self->_isTransitioning = NO;
-                    }];
+    animateAlongsideTransition:^(id<UIViewControllerTransitionCoordinatorContext> _Nonnull context) {
+      __strong __typeof(weakSelf) strongSelf = weakSelf;
+      if (!strongSelf)
+        return;
+
+      [[context containerView] addSubview:strongSelf->_transitionFakeView];
+      strongSelf->_transitionFakeView.frame = strongSelf.isBeingDismissed ? dismissedFrame : presentedFrame;
+
+      strongSelf->_transitioningTimer = [CADisplayLink displayLinkWithTarget:strongSelf
+                                                                    selector:@selector(handleTransitionTracker)];
+      [strongSelf->_transitioningTimer addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
+    }
+    completion:^(id<UIViewControllerTransitionCoordinatorContext> _Nonnull context) {
+      __strong __typeof(weakSelf) strongSelf = weakSelf;
+      if (!strongSelf)
+        return;
+
+      [strongSelf->_transitioningTimer setPaused:YES];
+      [strongSelf->_transitioningTimer invalidate];
+      strongSelf->_transitioningTimer = nil;
+      [strongSelf->_transitionFakeView removeFromSuperview];
+      strongSelf->_isTransitioning = NO;
+    }];
 }
 
 - (void)handleTransitionTracker {

package/ios/core/RNScreensEventObserver.mm

@@ -126,8 +126,12 @@ using namespace facebook::react;
   _parentScreenController = nil;
   _window = view.window;
 
+  Class screenViewClass = NSClassFromString(@"RNSScreenView");
+  if (!screenViewClass)
+    return;
+
   for (UIView *current = view.superview; current; current = current.superview) {
-    if ([NSStringFromClass([current class]) isEqualToString:@"RNSScreenView"]) {
+    if ([current isKindOfClass:screenViewClass]) {
       [_screenTags addObject:@(current.tag)];
 
       UIViewController *screenVC = nil;