@onekeyfe/react-native-pager-view 3.0.179-alpha.2026101502 → 3.0.179-alpha.302

package/ios/RNCCollapsiblePagerViewComponentView.mm

@@ -1,5 +1,4 @@
 #import "RNCCollapsiblePagerViewComponentView.h"
-#import "RNCPagerViewComponentView.h"
 #import "RNCNativeScrollerComponentView.h"
 #import "RNCCollapsiblePagerReleasedStatePolicy.h"
 
@@ -195,23 +194,6 @@ static BOOL RNCIsEnabledHorizontalScrollOwner(UIScrollView *scroll)
     scroll.contentSize.height <= CGRectGetHeight(scroll.bounds) + 0.5;
 }
 
-static UIScrollView *RNCNestedOuterReactPagerScrollView(UIView *view)
-{
-  Class outerPagerClass = NSClassFromString(@"RNCPagerViewComponentView");
-  if (outerPagerClass == Nil) return nil;
-  UIScrollView *pagingAncestor = nil;
-  for (UIView *ancestor = view.superview; ancestor != nil; ancestor = ancestor.superview) {
-    if ([ancestor isKindOfClass:UIScrollView.class] &&
-        ((UIScrollView *)ancestor).pagingEnabled) {
-      pagingAncestor = (UIScrollView *)ancestor;
-    }
-    if ([ancestor isKindOfClass:outerPagerClass]) {
-      return pagingAncestor.panGestureRecognizer.enabled ? pagingAncestor : nil;
-    }
-  }
-  return nil;
-}
-
 static void RNCGuardNestedHorizontalPans(UIView *view, UIGestureRecognizer *guard)
 {
   if ([view isKindOfClass:UIScrollView.class]) {
@@ -237,7 +219,6 @@ static void RNCCollapsiblePagerLog(NSString *message)
   logFunction(logClass, selector, @"CollapsiblePager", message);
 }
 
-
 static BOOL RNCGetColorComponents(UIColor *color, UITraitCollection *traits,
                                   CGFloat *red, CGFloat *green, CGFloat *blue, CGFloat *alpha)
 {
@@ -1061,9 +1042,7 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
       CGFloat maximum = MAX(0, inner.contentSize.width - CGRectGetWidth(inner.bounds));
       BOOL canScroll = maximum > 0 && (intent.x < 0
         ? inner.contentOffset.x < maximum - 0.5 : inner.contentOffset.x > 0.5);
-      if (canScroll) {
-        return NO;
-      }
+      if (canScroll) return NO;
     }
   }
   if (gestureRecognizer == self.panGestureRecognizer && self.excludedHeaderView != nil) {
@@ -1073,8 +1052,7 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
       return NO;
     }
   }
-  BOOL result = [super gestureRecognizerShouldBegin:gestureRecognizer];
-  return result;
+  return [super gestureRecognizerShouldBegin:gestureRecognizer];
 }
 
 @end
@@ -1263,8 +1241,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
 
 @interface RNCCollapsiblePagerOuterPagerPanGestureRecognizer : UIPanGestureRecognizer
 @property (nonatomic, strong) NSHashTable<UIGestureRecognizer *> *blockedPagerGestures;
-@property (nonatomic, weak) UITouch *trackedTouch;
-@property (nonatomic, assign) BOOL protectsNestedBody;
 @end
 
 @implementation RNCCollapsiblePagerOuterPagerPanGestureRecognizer
@@ -1289,14 +1265,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   return NO;
 }
 
-- (void)reset
-{
-  [super reset];
-  self.trackedTouch = nil;
-  self.protectsNestedBody = NO;
-  self.cancelsTouchesInView = YES;
-}
-
 @end
 
 @interface RNCCollapsiblePagerVerticalPagerGuardGestureRecognizer : UIGestureRecognizer
@@ -1440,8 +1408,7 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   UIScrollViewDelegate,
   UIGestureRecognizerDelegate,
   RCTMountingTransactionObserving,
-  RNCNativeScrollerInsetCoordinator,
-  RNCPagerViewNestedOverlayObserver
+  RNCNativeScrollerInsetCoordinator
 >
 - (void)finishPagerScrollEmittingSelection:(BOOL)emitSelection;
 - (void)completeTransitionOnNextRunLoopForGeneration:(NSUInteger)generation
@@ -1451,8 +1418,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
 - (void)liftSharedHeadersForPagerTransition:(NSString *)reason;
 - (void)restoreSharedHeadersToContainer;
 - (void)layoutSharedHeaders;
-- (void)restorePinnedStickyHeader;
-- (void)updatePinnedStickyHeader;
 - (UIScrollView *)currentVerticalScrollViewForParentPager;
 - (UIScrollView *)verticalScrollViewForPageAtIndex:(NSInteger)pageIndex;
 - (UIScrollView *)findExplicitNativeScrollerInView:(UIView *)view;
@@ -1464,32 +1429,19 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
 - (void)detachSharedHeaderPressCancellationGesture;
 - (void)updateRefreshControlForScrollView:(UIScrollView *)scrollView;
 - (void)releaseRefreshControlForScrollView:(UIScrollView *)scrollView;
-- (void)cancelTopInsetReboundCheck;
-- (void)scheduleTopInsetReboundCheck;
-- (void)syncScrollEdgeAppearance;
-- (void)updateScrollEdgeContentMasks;
-- (void)restoreScrollEdgeContentMasks;
 - (void)sharedHeaderPressCancellationGestureChanged:(UIPanGestureRecognizer *)recognizer;
 - (void)outerPagerGestureChanged:(UIPanGestureRecognizer *)recognizer;
 - (void)verticalPagerGuardGestureChanged:(UIPanGestureRecognizer *)recognizer;
 - (void)connectVerticalPagerGuard;
 - (void)observedListPanChanged:(UIPanGestureRecognizer *)recognizer;
-- (BOOL)resolveExternalTopOverlay;
-- (void)registerExternalOuterPager;
-- (CGFloat)effectiveTopOverlayHeight;
-- (BOOL)hasFixedTopOverlay;
 @end
 
 @implementation RNCCollapsiblePagerViewComponentView {
+#if DEBUG
+  NSUInteger _offsetDiagSequence;
+#endif
   UIView *_containerView;
   RNCCollapsiblePagerSharedHeaderView *_sharedHeaderHostView;
-  UIView *_pinnedStickyHostView;
-  BOOL _stickyHeaderIsPinned;
-  UIView *_sharedHeaderMaskView;
-  UIView *_originalSharedHeaderMaskView;
-  NSMapTable<UIView *, id> *_originalPageMasks;
-  NSMapTable<UIView *, UIView *> *_ownedPageMasks;
-  CGFloat _pageMaskBoundary;
   UIPageViewController *_pageViewController;
   UIScrollView *_pageViewControllerScrollView;
   UIScrollView *_pagerScrollView;
@@ -1497,16 +1449,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   NSMutableArray<UIViewController *> *_pageControllers;
   UIView *_headerView;
   UIView *_stickyHeaderView;
-  UIView *_topOverlayView;
-  UIView *_topOverlayHostView;
-  UIScrollEdgeElementContainerInteraction *_topEdgeInteraction;
-  UIScrollEdgeElementContainerInteraction *_stickyEdgeInteraction;
-  UILabel *_topEdgeMarker;
-  UILabel *_stickyEdgeMarker;
-  __weak UIView *_topEdgeInteractionHost;
-  __weak UIView *_stickyEdgeInteractionHost;
-  __weak UIScrollView *_topEdgeScrollView;
-  UIScrollEdgeEffectStyle *_originalTopEdgeStyle;
   RNCCollapsiblePagerNativeTabBarView *_nativeTabBarView;
   RNCCollapsiblePagerNativeSubHeaderView *_nativeSubHeaderView;
   NSInteger _currentIndex;
@@ -1514,22 +1456,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   NSInteger _pendingInitialPage;
   NSInteger _headerHeight;
   NSInteger _stickyHeaderHeight;
-  CGFloat _topOverlayHeight;
-  NSInteger _externalTopOverlayTag;
-  __weak UIView *_externalTopOverlayView;
-  CGFloat _externalTopOverlayHeight;
-  __weak RNCPagerViewComponentView *_externalOuterPager;
-  BOOL _externalOuterPageActive;
-  BOOL _externalOuterTransitioning;
-  BOOL _topScrollEdgeHard;
-  NSString *_topOverlayColorScheme;
-  BOOL _pendingTopOverlayAppearanceCommit;
-  BOOL _applyingTopOverlayInsetChange;
-  BOOL _correctingTopInsetRebound;
-  __weak UIScrollView *_pendingTopInsetReboundScrollView;
-  NSString *_pendingTopInsetReboundPageKey;
-  NSUInteger _pendingTopInsetReboundGeneration;
-  NSTimer *_topInsetReboundTimer;
   CGFloat _nativeTabBarHeight;
   CGFloat _nativeSubHeaderHeight;
   CGFloat _headerOffset;
@@ -1549,7 +1475,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   NSInteger _pendingGoToIndex;
   BOOL _pendingGoToAnimated;
   BOOL _needsSlotRebuild;
-  BOOL _deferTopEdgeSlotRebuild;
   BOOL _hasAppliedInitialPage;
   BOOL _needsPropsReapply;
   NSString *_layoutDirection;
@@ -1587,6 +1512,9 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   NSUInteger _observedPageGeneration;
   NSDictionary<NSString *, NSNumber *> *_transitionPageOffsets;
   NSMutableIndexSet *_transitionCompensatedPages;
+#if DEBUG
+  NSInteger _transitionDiagBucket;
+#endif
   NSInteger _transitionSourceIndex;
   BOOL _syntheticPageRestore;
   BOOL _headerSettledAtTop;
@@ -1652,8 +1580,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
     _originalAlwaysBounceVertical = [NSMapTable weakToStrongObjectsMapTable];
     _originalDirectionalLockEnabled = [NSMapTable weakToStrongObjectsMapTable];
     _originalInsetAdjustmentBehavior = [NSMapTable weakToStrongObjectsMapTable];
-    _originalPageMasks = [NSMapTable strongToStrongObjectsMapTable];
-    _ownedPageMasks = [NSMapTable strongToStrongObjectsMapTable];
     _pageKeys = @[];
     _retainedPages = @"[]";
     _currentIndex = 0;
@@ -1681,12 +1607,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
     _sharedHeaderHostView = [RNCCollapsiblePagerSharedHeaderView new];
     _sharedHeaderHostView.clipsToBounds = NO;
     [_containerView addSubview:_sharedHeaderHostView];
-    _pinnedStickyHostView = [UIView new];
-    _pinnedStickyHostView.hidden = YES;
-    [_containerView addSubview:_pinnedStickyHostView];
-    _topOverlayHostView = [UIView new];
-    _topOverlayHostView.hidden = YES;
-    [_containerView addSubview:_topOverlayHostView];
 
     _verticalPagerGesture =
       [[RNCCollapsiblePagerVerticalPagerGuardGestureRecognizer alloc]
@@ -1744,39 +1664,14 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
       viewProps.pointerEvents == PointerEventsMode::BoxOnly) {
     return [super hitTest:point withEvent:event];
   }
-  if (_topOverlayView != nil) {
-    CGPoint overlayPoint = [_topOverlayView convertPoint:point fromView:self];
-    UIView *overlayHitView = [_topOverlayView hitTest:overlayPoint withEvent:event];
-    if (overlayHitView != nil) return overlayHitView;
-  }
-  if (_stickyHeaderIsPinned) {
-    CGPoint stickyPoint = [_pinnedStickyHostView convertPoint:point fromView:self];
-    UIView *stickyHitView = [_pinnedStickyHostView hitTest:stickyPoint withEvent:event];
-    if (stickyHitView != nil) return stickyHitView;
-  }
-  CGPoint headerPoint = [_sharedHeaderHostView convertPoint:point fromView:self];
-  BOOL sharedHeaderPointIsVisible =
-    _sharedHeaderHostView.maskView != _sharedHeaderMaskView ||
-    _sharedHeaderMaskView == nil ||
-    CGRectContainsPoint(_sharedHeaderMaskView.frame, headerPoint);
   if (_nativeSmoothHeaderScrollEnabled && !_isBeingRecycled &&
-      _sharedHeaderHostView.superview != _containerView &&
-      sharedHeaderPointIsVisible) {
+      _sharedHeaderHostView.superview != _containerView) {
+    CGPoint headerPoint = [_sharedHeaderHostView convertPoint:point fromView:self];
     UIView *headerHitView =
       [_sharedHeaderHostView hitTest:headerPoint withEvent:event];
     if (headerHitView != nil) return headerHitView;
   }
-  UIView *hitView = [super hitTest:point withEvent:event];
-  if (hitView != nil && !sharedHeaderPointIsVisible &&
-      (hitView == _sharedHeaderHostView ||
-       [hitView isDescendantOfView:_sharedHeaderHostView])) return nil;
-  if (hitView != nil && _ownedPageMasks.count > 0 &&
-      [_containerView convertPoint:point fromView:self].y < _pageMaskBoundary) {
-    for (UIView *page in _ownedPageMasks.keyEnumerator.allObjects) {
-      if ([hitView isDescendantOfView:page]) return nil;
-    }
-  }
-  return hitView;
+  return [super hitTest:point withEvent:event];
 }
 
 - (void)willMoveToSuperview:(UIView *)newSuperview
@@ -1791,18 +1686,11 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
 - (void)didMoveToWindow
 {
   [super didMoveToWindow];
-  [self registerExternalOuterPager];
-  BOOL externalHeightChanged = [self resolveExternalTopOverlay];
-  if (self.window == nil) [self restoreScrollEdgeContentMasks];
-  [self syncScrollEdgeAppearance];
-  [self emitTopScrollEdgeCapability];
-  [self updateTopScrollEdgeForScrollView:_observedScrollView];
   [self updateSharedHeaderPressCancellationGesture];
   [self updateHeaderSettledStateForceBusy:NO];
   for (UIScrollView *scrollView in _originalInsets.keyEnumerator) {
-    [self updateNativeScrollerViewport:scrollView stickyHeight:self.window == nil ? 0 : _stickyHeaderHeight + self.effectiveTopOverlayHeight];
+    [self updateNativeScrollerViewport:scrollView stickyHeight:self.window == nil ? 0 : _stickyHeaderHeight];
   }
-  if (externalHeightChanged) [self reapplyInsetsToObservedScrollView];
   // OneKey patch: removing a decelerating page from its window can suppress
   // UIKit's final scroll callback. Restore the last acknowledged page on reattach.
   if (self.window != nil && _isPagerDragging &&
@@ -1824,319 +1712,8 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   }
 }
 
-- (CGFloat)effectiveTopOverlayHeight
-{
-  return _topOverlayView != nil ? _topOverlayHeight : _externalTopOverlayHeight;
-}
-
-- (BOOL)hasFixedTopOverlay
-{
-  return _topOverlayView != nil ||
-    (_externalTopOverlayTag > 0 && _externalTopOverlayHeight > 0);
-}
-
-- (void)registerExternalOuterPager
-{
-  RNCPagerViewComponentView *outer = nil;
-  if (_externalTopOverlayTag > 0 && self.window != nil && !_isBeingRecycled) {
-    for (UIView *ancestor = self.superview; ancestor != nil; ancestor = ancestor.superview) {
-      if ([ancestor isKindOfClass:RNCPagerViewComponentView.class]) {
-        outer = (RNCPagerViewComponentView *)ancestor;
-        break;
-      }
-    }
-  }
-  if (_externalOuterPager == outer) return;
-  [_externalOuterPager removeNestedOverlayObserver:self];
-  _externalOuterPager = outer;
-  _externalOuterPageActive = NO;
-  _externalOuterTransitioning = NO;
-  [outer addNestedOverlayObserver:self];
-}
-
-- (BOOL)resolveExternalTopOverlay
-{
-  UIView *nextView = nil;
-  CGFloat nextHeight = 0;
-  if (_externalTopOverlayTag > 0 && _topOverlayView == nil &&
-      self.window != nil && !_isBeingRecycled) {
-    for (UIView *ancestor = self.superview; ancestor != nil; ancestor = ancestor.superview) {
-      UIView *candidate = [ancestor viewWithTag:_externalTopOverlayTag];
-      if (candidate == nil || candidate == self ||
-          [candidate isDescendantOfView:self] || candidate.window != self.window) continue;
-      nextView = candidate;
-      break;
-    }
-    if (nextView != nil && CGRectGetHeight(nextView.bounds) > 0) {
-      nextHeight = MAX(0, CGRectGetMaxY([nextView convertRect:nextView.bounds
-        toView:_containerView]));
-    }
-  }
-  if (nextView == nil && _externalOuterTransitioning &&
-      _externalTopOverlayTag > 0 && self.window != nil) {
-    nextHeight = _externalTopOverlayHeight;
-  }
-  BOOL changed = _externalTopOverlayView != nextView ||
-    fabs(_externalTopOverlayHeight - nextHeight) > 0.5;
-  _externalTopOverlayView = nextView;
-  _externalTopOverlayHeight = nextHeight;
-  _topOverlayHostView.hidden = !self.hasFixedTopOverlay;
-  _topOverlayHostView.userInteractionEnabled = _topOverlayView != nil;
-  return changed;
-}
-
-- (void)outerPagerDidUpdateOverlayOwner:(BOOL)active transitioning:(BOOL)transitioning
-{
-  if (_isBeingRecycled || _externalOuterPager == nil || _externalTopOverlayTag <= 0) return;
-  if (_externalOuterPageActive == active && _externalOuterTransitioning == transitioning) return;
-  BOOL wasTransitioning = _externalOuterTransitioning;
-  _externalOuterPageActive = active;
-  _externalOuterTransitioning = transitioning;
-  if (transitioning && !wasTransitioning) {
-    [self updateTopScrollEdgeForScrollView:nil];
-    [self liftSharedHeadersForPagerTransition:@"outer"];
-  } else if (!transitioning && wasTransitioning &&
-             !_transitioning && !_isPagerDragging && active) {
-    [self attachSharedHeadersToScrollView:_observedScrollView];
-  }
-  [self updateTopScrollEdgeForScrollView:transitioning ? nil : _observedScrollView];
-  [self updateScrollEdgeContentMasks];
-  [self setNeedsLayout];
-}
-
-- (void)traitCollectionDidChange:(UITraitCollection *)previousTraitCollection
-{
-  [super traitCollectionDidChange:previousTraitCollection];
-  if (previousTraitCollection.userInterfaceStyle != self.traitCollection.userInterfaceStyle) {
-    [self syncScrollEdgeAppearance];
-  }
-}
-
-- (void)syncScrollEdgeAppearance
-{
-  BOOL active = _topScrollEdgeHard &&
-    (self.hasFixedTopOverlay || _stickyHeaderView != nil) && self.window != nil &&
-    !_isBeingRecycled;
-  UIUserInterfaceStyle style = UIUserInterfaceStyleUnspecified;
-  if (active) {
-    if ([_topOverlayColorScheme isEqualToString:@"dark"]) {
-      style = UIUserInterfaceStyleDark;
-    } else if ([_topOverlayColorScheme isEqualToString:@"light"]) {
-      style = UIUserInterfaceStyleLight;
-    } else {
-      style = self.traitCollection.userInterfaceStyle;
-    }
-  }
-  if (_topOverlayHostView.overrideUserInterfaceStyle == style) return;
-  _topOverlayHostView.overrideUserInterfaceStyle = style;
-  _pinnedStickyHostView.overrideUserInterfaceStyle = style;
-}
-
-- (void)restoreScrollEdgeContentMasks
-{
-  if (_sharedHeaderHostView.maskView == _sharedHeaderMaskView) {
-    _sharedHeaderHostView.maskView = _originalSharedHeaderMaskView;
-  }
-  _sharedHeaderMaskView = nil;
-  _originalSharedHeaderMaskView = nil;
-  for (UIView *page in _ownedPageMasks.keyEnumerator.allObjects) {
-    if (page.maskView == [_ownedPageMasks objectForKey:page]) {
-      id original = [_originalPageMasks objectForKey:page];
-      page.maskView = original == NSNull.null ? nil : original;
-    }
-  }
-  [_ownedPageMasks removeAllObjects];
-  [_originalPageMasks removeAllObjects];
-  _pageMaskBoundary = 0;
-}
-
-- (void)updateScrollEdgeContentMasks
-{
-  BOOL enabled = _topScrollEdgeHard &&
-    (self.hasFixedTopOverlay || _stickyHeaderView != nil) &&
-    self.window != nil && !_isBeingRecycled;
-  if (!enabled) {
-    [self restoreScrollEdgeContentMasks];
-    return;
-  }
-  if (self.hasFixedTopOverlay && _sharedHeaderHostView.window == self.window &&
-      CGRectGetHeight(_sharedHeaderHostView.bounds) > 0 &&
-      CGRectGetHeight(_topOverlayHostView.bounds) > 0) {
-    if (_sharedHeaderMaskView == nil) {
-      _originalSharedHeaderMaskView = _sharedHeaderHostView.maskView;
-      _sharedHeaderMaskView = [UIView new];
-      _sharedHeaderMaskView.backgroundColor = UIColor.blackColor;
-      _sharedHeaderHostView.maskView = _sharedHeaderMaskView;
-    }
-    CGFloat topBottom = CGRectGetMaxY([_topOverlayHostView
-      convertRect:_topOverlayHostView.bounds toView:_containerView]);
-    CGFloat localTop = [_containerView convertPoint:CGPointMake(0, topBottom)
-      toView:_sharedHeaderHostView].y;
-    _sharedHeaderMaskView.frame = CGRectMake(0, localTop,
-      CGRectGetWidth(_sharedHeaderHostView.bounds),
-      MAX(0, CGRectGetHeight(_sharedHeaderHostView.bounds) - localTop));
-  } else if (_sharedHeaderMaskView != nil) {
-    if (_sharedHeaderHostView.maskView == _sharedHeaderMaskView) {
-      _sharedHeaderHostView.maskView = _originalSharedHeaderMaskView;
-    }
-    _sharedHeaderMaskView = nil;
-    _originalSharedHeaderMaskView = nil;
-  }
-
-  BOOL transitioning = _transitioning || _isPagerDragging || _externalOuterTransitioning ||
-    _sharedHeadersLiftedForPagerTransition;
-  CGFloat boundary = CGRectGetMaxY([_topOverlayHostView
-    convertRect:_topOverlayHostView.bounds toView:_containerView]);
-  UIView *sticky = _stickyHeaderIsPinned ? _pinnedStickyHostView : _stickyHeaderView;
-  if (sticky != nil && !sticky.hidden && sticky.window == self.window &&
-      CGRectGetHeight(sticky.bounds) > 0) {
-    boundary = MAX(boundary, CGRectGetMaxY([sticky
-      convertRect:sticky.bounds toView:_containerView]));
-  }
-  _pageMaskBoundary = boundary;
-  NSMutableSet<UIView *> *visiblePages = [NSMutableSet new];
-  if (transitioning) {
-    for (UIViewController *controller in _pageControllers) {
-      UIView *page = controller.view;
-      if (page.window != self.window ||
-          !CGRectIntersectsRect([page convertRect:page.bounds toView:_containerView],
-            _containerView.bounds)) continue;
-      [visiblePages addObject:page];
-      UIView *mask = [_ownedPageMasks objectForKey:page];
-      if (mask == nil) {
-        [_originalPageMasks setObject:page.maskView ?: NSNull.null forKey:page];
-        mask = [UIView new];
-        mask.backgroundColor = UIColor.blackColor;
-        [_ownedPageMasks setObject:mask forKey:page];
-        page.maskView = mask;
-      }
-      CGFloat localTop = [_containerView convertPoint:CGPointMake(0, boundary)
-        toView:page].y;
-      mask.frame = CGRectMake(0, localTop, CGRectGetWidth(page.bounds),
-        MAX(0, CGRectGetHeight(page.bounds) - localTop));
-    }
-  }
-  for (UIView *page in _ownedPageMasks.keyEnumerator.allObjects) {
-    if ([visiblePages containsObject:page]) continue;
-    UIView *mask = [_ownedPageMasks objectForKey:page];
-    if (page.maskView == mask) {
-      id original = [_originalPageMasks objectForKey:page];
-      page.maskView = original == NSNull.null ? nil : original;
-    }
-    [_ownedPageMasks removeObjectForKey:page];
-    [_originalPageMasks removeObjectForKey:page];
-  }
-}
-
-- (void)updateEventEmitter:(const EventEmitter::Shared &)eventEmitter
-{
-  [super updateEventEmitter:eventEmitter];
-  [self emitTopScrollEdgeCapability];
-}
-
-- (void)emitTopScrollEdgeCapability
-{
-  if (self.window == nil || _isBeingRecycled) return;
-  const auto emitter = [self eventEmitter];
-  if (!emitter) return;
-  BOOL available = NO;
-  if (@available(iOS 26.0, *)) available = YES;
-  emitter->onScrollEdgeCapability({.available = (bool)available});
-}
-
-- (void)updateTopScrollEdgeForScrollView:(UIScrollView *)scrollView
-{
-  [self syncScrollEdgeAppearance];
-  if (@available(iOS 26.0, *)) {
-    if (_pendingTopOverlayAppearanceCommit) scrollView = nil;
-    BOOL externalOwnerReady = _externalTopOverlayTag <= 0 ||
-      (_externalOuterPageActive && !_externalOuterTransitioning);
-    BOOL hasOverlay = _topScrollEdgeHard && self.hasFixedTopOverlay &&
-      externalOwnerReady && self.window != nil;
-    BOOL hasSticky = _topScrollEdgeHard && _stickyHeaderView != nil &&
-      externalOwnerReady && self.window != nil;
-    BOOL enabled = (hasOverlay || hasSticky) && scrollView != nil;
-    BOOL topHostChanged = (_topEdgeInteraction != nil) != hasOverlay ||
-      (hasOverlay && _topEdgeInteractionHost != _topOverlayHostView);
-    if (_topEdgeScrollView != nil && (!enabled || _topEdgeScrollView != scrollView ||
-        topHostChanged)) {
-      [_topEdgeInteractionHost removeInteraction:_topEdgeInteraction];
-      _topEdgeInteraction.scrollView = nil;
-      [_stickyEdgeInteractionHost removeInteraction:_stickyEdgeInteraction];
-      _stickyEdgeInteraction.scrollView = nil;
-      [_topEdgeMarker removeFromSuperview];
-      [_stickyEdgeMarker removeFromSuperview];
-      _topEdgeScrollView.topEdgeEffect.style = _originalTopEdgeStyle;
-      _topEdgeInteraction = nil;
-      _stickyEdgeInteraction = nil;
-      _topEdgeMarker = nil;
-      _stickyEdgeMarker = nil;
-      _topEdgeInteractionHost = nil;
-      _stickyEdgeInteractionHost = nil;
-      _topEdgeScrollView = nil;
-      _originalTopEdgeStyle = nil;
-    }
-    if (enabled && _topEdgeScrollView == nil) {
-      _originalTopEdgeStyle = scrollView.topEdgeEffect.style;
-      _topEdgeScrollView = scrollView;
-      scrollView.topEdgeEffect.style = UIScrollEdgeEffectStyle.hardStyle;
-    }
-    if (hasOverlay && enabled && _topEdgeInteraction == nil) {
-      // UIKit needs a native element to shape the edge effect around React-drawn content.
-      _topEdgeMarker = [UILabel new];
-      _topEdgeMarker.frame = _topOverlayHostView.bounds;
-      _topEdgeMarker.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-      _topEdgeMarker.text = @" ";
-      _topEdgeMarker.textColor = UIColor.clearColor;
-      _topEdgeMarker.backgroundColor = UIColor.clearColor;
-      _topEdgeMarker.userInteractionEnabled = NO;
-      _topEdgeMarker.isAccessibilityElement = NO;
-      _topEdgeMarker.accessibilityElementsHidden = YES;
-      [_topOverlayHostView addSubview:_topEdgeMarker];
-      _topEdgeInteraction = [UIScrollEdgeElementContainerInteraction new];
-      _topEdgeInteraction.edge = UIRectEdgeTop;
-      _topEdgeInteraction.scrollView = scrollView;
-      [_topOverlayHostView addInteraction:_topEdgeInteraction];
-      _topEdgeInteractionHost = _topOverlayHostView;
-    }
-    BOOL legacyStickyPinned = !_nativeSmoothHeaderScrollEnabled &&
-      _stickyHeaderView != nil && _headerOffset >= _headerHeight - 0.5;
-    BOOL stickyEnabled = enabled && (_stickyHeaderIsPinned || legacyStickyPinned);
-    UIView *stickyInteractionHost = _stickyHeaderIsPinned
-      ? _pinnedStickyHostView : _stickyHeaderView;
-    if (_stickyEdgeInteractionHost != nil &&
-        (!stickyEnabled || _stickyEdgeInteractionHost != stickyInteractionHost)) {
-      [_stickyEdgeInteractionHost removeInteraction:_stickyEdgeInteraction];
-      _stickyEdgeInteraction.scrollView = nil;
-      [_stickyEdgeMarker removeFromSuperview];
-      _stickyEdgeMarker = nil;
-      _stickyEdgeInteraction = nil;
-      _stickyEdgeInteractionHost = nil;
-    }
-    if (stickyEnabled && _stickyEdgeInteraction == nil) {
-      _stickyEdgeMarker = [UILabel new];
-      _stickyEdgeMarker.frame = stickyInteractionHost.bounds;
-      _stickyEdgeMarker.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-      _stickyEdgeMarker.text = @" ";
-      _stickyEdgeMarker.textColor = UIColor.clearColor;
-      _stickyEdgeMarker.backgroundColor = UIColor.clearColor;
-      _stickyEdgeMarker.userInteractionEnabled = NO;
-      _stickyEdgeMarker.isAccessibilityElement = NO;
-      _stickyEdgeMarker.accessibilityElementsHidden = YES;
-      [stickyInteractionHost addSubview:_stickyEdgeMarker];
-      _stickyEdgeInteraction = [UIScrollEdgeElementContainerInteraction new];
-      _stickyEdgeInteraction.edge = UIRectEdgeTop;
-      _stickyEdgeInteraction.scrollView = scrollView;
-      [stickyInteractionHost addInteraction:_stickyEdgeInteraction];
-      _stickyEdgeInteractionHost = stickyInteractionHost;
-    }
-    [self updateScrollEdgeContentMasks];
-  }
-}
-
 - (void)dealloc
 {
-  [self updateTopScrollEdgeForScrollView:nil];
   [self cancelHeaderSettledCheck];
   [[NSNotificationCenter defaultCenter] removeObserver:self name:@"OneKeyNativeListScrollCommandAccepted" object:nil];
   for (UIScrollView *scrollView in _originalInsets.keyEnumerator) {
@@ -2189,7 +1766,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   _hasPendingDirectNativePagerChange = NO;
   if (_directNativePagerEnabled == enabled) return;
 
-  [self restoreScrollEdgeContentMasks];
   [self detachScrollObserver];
   [self restoreSharedHeadersToContainer];
   if (_blockerGesture != nil) {
@@ -2265,33 +1841,8 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
 
 #pragma mark - Smooth shared header ownership
 
-- (void)restorePinnedStickyHeader
-{
-  if (!_stickyHeaderIsPinned) return;
-  _stickyHeaderIsPinned = NO;
-  _stickyHeaderView.transform = CGAffineTransformIdentity;
-  _nativeTabBarView.transform = CGAffineTransformIdentity;
-  _nativeSubHeaderView.transform = CGAffineTransformIdentity;
-  [_stickyHeaderView removeFromSuperview];
-  [_nativeTabBarView removeFromSuperview];
-  [_nativeSubHeaderView removeFromSuperview];
-  if (_stickyHeaderView != nil) [_sharedHeaderHostView addSubview:_stickyHeaderView];
-  [_sharedHeaderHostView addSubview:_nativeTabBarView];
-  [_sharedHeaderHostView addSubview:_nativeSubHeaderView];
-  _pinnedStickyHostView.hidden = YES;
-  _pinnedStickyHostView.layer.zPosition = 0;
-  [_containerView addSubview:_pinnedStickyHostView];
-  if ([_pagerScrollView isKindOfClass:RNCCollapsiblePagerDirectScrollView.class]) {
-    ((RNCCollapsiblePagerDirectScrollView *)_pagerScrollView).excludedHeaderView = _sharedHeaderHostView;
-  }
-  [_nativeTabBarView updateAncestorGesturePrecedence];
-  [_nativeSubHeaderView updateAncestorGesturePrecedence];
-}
-
 - (void)restoreSharedHeadersToContainer
 {
-  [self restorePinnedStickyHeader];
-  [self updateTopScrollEdgeForScrollView:_observedScrollView];
   _sharedHeaderScrollView = nil;
   _sharedHeadersLiftedForPagerTransition = NO;
   _sharedHeaderHostView.layer.zPosition = 0;
@@ -2299,15 +1850,11 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
     [_containerView addSubview:_sharedHeaderHostView];
   }
   [self layoutSharedHeaders];
-  if (self.hasFixedTopOverlay) {
-    [_containerView bringSubviewToFront:_topOverlayHostView];
-  }
 }
 
 - (void)attachSharedHeadersToScrollView:(UIScrollView *)scrollView
 {
   if (!_nativeSmoothHeaderScrollEnabled || _transitioning || _isPagerDragging ||
-      _externalOuterTransitioning ||
       scrollView == nil || _isBeingRecycled) return;
   if ((UIView *)scrollView == _sharedHeaderHostView ||
       [scrollView isDescendantOfView:_sharedHeaderHostView]) {
@@ -2319,16 +1866,13 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   }
   if (_sharedHeaderScrollView == scrollView &&
       _sharedHeaderHostView.superview == scrollView) {
-    _sharedHeaderHostView.layer.zPosition =
-      _topScrollEdgeHard && (self.hasFixedTopOverlay || _stickyHeaderView != nil) ? 0 : 1000;
     [self layoutSharedHeaders];
     return;
   }
 
   _sharedHeaderScrollView = scrollView;
   _sharedHeadersLiftedForPagerTransition = NO;
-  _sharedHeaderHostView.layer.zPosition =
-    _topScrollEdgeHard && (self.hasFixedTopOverlay || _stickyHeaderView != nil) ? 0 : 1000;
+  _sharedHeaderHostView.layer.zPosition = 1000;
   if (_sharedHeaderHostView.superview != scrollView) {
     [scrollView addSubview:_sharedHeaderHostView];
   }
@@ -2375,114 +1919,56 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
 
   _sharedHeaderHostView.frame = CGRectMake(
     0,
-    attachedToList ? -totalHeight : self.effectiveTopOverlayHeight,
+    attachedToList ? -totalHeight : 0,
     width,
     totalHeight
   );
   CGFloat stickyY = _headerHeight;
   _headerView.frame = CGRectMake(0, 0, width, _headerHeight);
-  CGPoint pinnedOrigin = _stickyHeaderIsPinned
-    ? [_sharedHeaderScrollView convertPoint:CGPointMake(0, self.effectiveTopOverlayHeight) fromView:_containerView]
-    : CGPointMake(0, self.effectiveTopOverlayHeight);
-  _pinnedStickyHostView.frame = CGRectMake(
-    pinnedOrigin.x, pinnedOrigin.y, width, _stickyHeaderHeight);
-  CGFloat stickyChildY = _stickyHeaderIsPinned ? 0 : stickyY;
-  _stickyHeaderView.frame = CGRectMake(0, stickyChildY, width, _stickyHeaderHeight);
+  _stickyHeaderView.frame = CGRectMake(0, stickyY, width, _stickyHeaderHeight);
   CGFloat nativeTabBarVisibleHeight = _nativeTabBarView.hidden
     ? 0
     : MIN(_stickyHeaderHeight, _nativeTabBarHeight);
   _nativeTabBarView.frame = CGRectMake(
     0,
-    stickyChildY,
+    stickyY,
     width,
     nativeTabBarVisibleHeight
   );
   _nativeSubHeaderView.frame = CGRectMake(
     0,
-    stickyChildY + nativeTabBarVisibleHeight,
+    stickyY + nativeTabBarVisibleHeight,
     width,
     MIN(
       MAX(0, _stickyHeaderHeight - nativeTabBarVisibleHeight),
       _nativeSubHeaderHeight
     )
   );
-  _topOverlayHostView.frame = CGRectMake(0, 0, width, self.effectiveTopOverlayHeight);
-  _topOverlayView.frame = _topOverlayHostView.bounds;
   [self applyHeaderOffset];
 }
 
-- (void)updatePinnedStickyHeader
+- (void)offsetDiag:(NSString *)reason page:(NSInteger)index scroll:(UIScrollView *)scroll
 {
-  BOOL attachedToList = _nativeSmoothHeaderScrollEnabled &&
-    _sharedHeaderScrollView != nil && !_sharedHeadersLiftedForPagerTransition;
-  if (!attachedToList && !_stickyHeaderIsPinned) return;
-  UIScrollView *scrollView = _sharedHeaderScrollView;
-  NSNumber *appliedTop = [_appliedTopInsets objectForKey:scrollView];
-  CGFloat refreshInset = scrollView.refreshControl != nil && appliedTop != nil
-    ? MAX(0, scrollView.contentInset.top - appliedTop.doubleValue) : 0;
-  CGFloat pinnedTranslation = MAX(0, _currentLogicalOffset - _headerHeight - refreshInset);
-  CGFloat stickyTop = [_sharedHeaderHostView convertPoint:
-    CGPointMake(0, _headerHeight + pinnedTranslation) toView:self].y;
-  BOOL shouldPin = _topScrollEdgeHard &&
-    _stickyHeaderView != nil && attachedToList && !_transitioning &&
-    !_externalOuterTransitioning &&
-    !_isPagerDragging && _headerOffset >= _headerHeight - 0.5 &&
-    stickyTop <= self.effectiveTopOverlayHeight + 0.5;
-  if (_stickyHeaderIsPinned && shouldPin && _pinnedStickyHostView.superview != scrollView) {
-    [self updateTopScrollEdgeForScrollView:nil];
-    [scrollView addSubview:_pinnedStickyHostView];
-    [self updateTopScrollEdgeForScrollView:_observedScrollView];
-  }
-  if (_stickyHeaderIsPinned == shouldPin) {
-    if (shouldPin) {
-      CGPoint origin = [scrollView convertPoint:CGPointMake(0, self.effectiveTopOverlayHeight)
-        fromView:_containerView];
-      _pinnedStickyHostView.frame = CGRectMake(origin.x, origin.y,
-        CGRectGetWidth(self.bounds), _stickyHeaderHeight);
-    }
-    return;
-  }
-
-  _stickyHeaderIsPinned = shouldPin;
-  UIView *host = shouldPin ? _pinnedStickyHostView : _sharedHeaderHostView;
-  _stickyHeaderView.transform = CGAffineTransformIdentity;
-  _nativeTabBarView.transform = CGAffineTransformIdentity;
-  _nativeSubHeaderView.transform = CGAffineTransformIdentity;
-  [_stickyHeaderView removeFromSuperview];
-  [_nativeTabBarView removeFromSuperview];
-  [_nativeSubHeaderView removeFromSuperview];
-  if (_stickyHeaderView != nil) [host addSubview:_stickyHeaderView];
-  [host addSubview:_nativeTabBarView];
-  [host addSubview:_nativeSubHeaderView];
-  CGFloat childY = shouldPin ? 0 : _headerHeight;
-  CGFloat width = CGRectGetWidth(self.bounds);
-  CGFloat tabHeight = _nativeTabBarView.hidden ? 0 : MIN(_stickyHeaderHeight, _nativeTabBarHeight);
-  _stickyHeaderView.frame = CGRectMake(0, childY, width, _stickyHeaderHeight);
-  _nativeTabBarView.frame = CGRectMake(0, childY, width, tabHeight);
-  _nativeSubHeaderView.frame = CGRectMake(0, childY + tabHeight, width,
-    MIN(MAX(0, _stickyHeaderHeight - tabHeight), _nativeSubHeaderHeight));
-  _pinnedStickyHostView.hidden = !shouldPin;
-  if ([_pagerScrollView isKindOfClass:RNCCollapsiblePagerDirectScrollView.class]) {
-    ((RNCCollapsiblePagerDirectScrollView *)_pagerScrollView).excludedHeaderView =
-      shouldPin ? _pinnedStickyHostView : _sharedHeaderHostView;
-  }
-  if (shouldPin) {
-    [scrollView addSubview:_pinnedStickyHostView];
-    _pinnedStickyHostView.layer.zPosition = 1000;
-    CGPoint origin = [scrollView convertPoint:CGPointMake(0, self.effectiveTopOverlayHeight)
-      fromView:_containerView];
-    _pinnedStickyHostView.frame = CGRectMake(origin.x, origin.y, width, _stickyHeaderHeight);
-  } else {
-    _pinnedStickyHostView.layer.zPosition = 0;
-    [_containerView addSubview:_pinnedStickyHostView];
-  }
-  [_nativeTabBarView updateAncestorGesturePrecedence];
-  [_nativeSubHeaderView updateAncestorGesturePrecedence];
-  [self updateTopScrollEdgeForScrollView:_observedScrollView];
+#if DEBUG
+  NSString *key = index >= 0 && index < _pageControllers.count ? [self pageKeyForIndex:index] : @"none";
+  if (![@[@"portfolio", @"perps", @"defi", @"nft", @"history"] containsObject:key]) key = @"other";
+  NSNumber *saved = index >= 0 && index < _pageControllers.count ? _pageOffsets[[self pageKeyForIndex:index]] : nil;
+  UIView *component = scroll == nil ? nil : RNCScrollComponentView(scroll);
+  RNCCollapsiblePagerLog([NSString stringWithFormat:
+    @"[HOME-OFFSET-DIAG] pager phase=%@ seq=%lu wallMs=%.0f mono=%.6f host=%p generation=%lu transitionId=%lu page=%ld key=%@ current=%ld destination=%ld transition=%d dragging=%d scroll=%p tag=%ld component=%p componentTag=%ld observed=%p ownerIndex=%ld ownerGeneration=%lu synthetic=%d cacheExists=%d cache=%.4f header=%.4f headerHeight=%ld physicalY=%.4f insetTop=%.4f insetBottom=%.4f logicalY=%.4f contentHeight=%.4f boundsHeight=%.4f",
+    reason, (unsigned long)++_offsetDiagSequence, NSDate.date.timeIntervalSince1970 * 1000, CACurrentMediaTime(),
+    (__bridge void *)self, (unsigned long)_generation, (unsigned long)_transitionId, (long)index, key,
+    (long)_currentIndex, (long)_destinationIndex, _transitioning, _isPagerDragging,
+    (__bridge void *)scroll, (long)scroll.tag, (__bridge void *)component, (long)component.tag,
+    (__bridge void *)_observedScrollView, (long)_observedPageIndex, (unsigned long)_observedPageGeneration, _syntheticPageRestore, saved != nil, saved.doubleValue, _headerOffset, (long)_headerHeight,
+    scroll.contentOffset.y, scroll.contentInset.top, scroll.contentInset.bottom,
+    scroll.contentOffset.y + scroll.contentInset.top, scroll.contentSize.height, scroll.bounds.size.height]);
+#endif
 }
 
 - (void)preparePageForHorizontalTransitionAtIndex:(NSInteger)pageIndex
 {
+  [self offsetDiag:@"prepare-check" page:pageIndex scroll:nil];
   if (!_nativeSmoothHeaderScrollEnabled ||
       pageIndex < 0 || pageIndex >= _pageControllers.count) return;
   UIScrollView *scrollView = [self verticalScrollViewForPageAtIndex:pageIndex];
@@ -2501,6 +1987,11 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   _transitionHeaderOffset = _headerOffset;
   _transitionPageOffsets = [_pageOffsets copy];
   _transitionCompensatedPages = [NSMutableIndexSet new];
+#if DEBUG
+  _transitionDiagBucket = -1;
+  [self offsetDiag:[NSString stringWithFormat:@"screen-begin-source=%ld-savedQ=%.4f", (long)_transitionSourceIndex,
+    [_transitionPageOffsets[self.currentPageKey] doubleValue]] page:_currentIndex scroll:nil];
+#endif
 }
 
 - (void)updatePageStateTransitionProgress:(CGFloat)progress
@@ -2517,6 +2008,16 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   CGFloat firstQ = [_transitionPageOffsets[[self pageKeyForIndex:first]] doubleValue];
   CGFloat secondQ = [_transitionPageOffsets[[self pageKeyForIndex:second]] doubleValue];
   _headerOffset = _transitionHeaderOffset;
+#if DEBUG
+  NSInteger bucket = (NSInteger)floor(fraction * 4);
+  if (_transitionDiagBucket != bucket) {
+    _transitionDiagBucket = bucket;
+    [self offsetDiag:[NSString stringWithFormat:
+      @"screen-progress-kind=%@-source=%ld-target=%ld-sourceQ=%.4f-targetQ=%.4f-position=%.4f-fraction=%.4f",
+      _isPagerDragging ? @"interactive" : @"programmatic-endpoint", (long)first, (long)second,
+      firstQ, secondQ, progress, fraction] page:_currentIndex scroll:nil];
+  }
+#endif
   _syntheticPageRestore = YES;
   NSInteger visibleFirst = MAX(0, MIN((NSInteger)floor(progress), (NSInteger)_pageControllers.count - 1));
   NSInteger visibleLast = MIN(visibleFirst + 1, (NSInteger)_pageControllers.count - 1);
@@ -2558,6 +2059,10 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   _transitionPageOffsets = nil;
   _transitionCompensatedPages = nil;
   [self layoutSharedHeaders];
+#if DEBUG
+  [self offsetDiag:[NSString stringWithFormat:@"screen-finish-source=%ld-cancelled=%d", (long)_transitionSourceIndex,
+    _currentIndex == _transitionSourceIndex] page:_currentIndex scroll:nil];
+#endif
 }
 
 #pragma mark - React mounting
@@ -2614,7 +2119,9 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
         if (!_nativeSmoothHeaderScrollEnabled && _transitionPageOffsets == nil && !_syntheticPageRestore &&
             ![_pendingPageRestoreKeys containsObject:pageKey] &&
             (ownsObservedPage || _pageOffsets[pageKey] == nil)) {
+          [self offsetDiag:@"mount-release-save-before" page:index scroll:scrollView];
           _pageOffsets[pageKey] = @(scrollView.contentOffset.y + scrollView.contentInset.top);
+          [self offsetDiag:@"mount-release-save-after" page:index scroll:scrollView];
         }
         break;
       }
@@ -2630,27 +2137,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
 - (void)mountingTransactionDidMount:(const MountingTransaction &)transaction
                withSurfaceTelemetry:(const SurfaceTelemetry &)surfaceTelemetry
 {
-  if (_needsSlotRebuild && !_deferTopEdgeSlotRebuild &&
-      !_transitioning && !_isPagerDragging) {
-    [self rebuildSlots];
-  }
-  [self registerExternalOuterPager];
-  if ([self resolveExternalTopOverlay]) {
-    [self reapplyInsetsToObservedScrollView];
-    [self setNeedsLayout];
-  }
-  if (_pendingTopOverlayAppearanceCommit) {
-    _pendingTopOverlayAppearanceCommit = NO;
-    BOOL localOverlayReady = _topOverlayView.superview == _topOverlayHostView &&
-      _topOverlayView.window == self.window;
-    BOOL externalOverlayReady = _externalTopOverlayTag > 0 &&
-      _externalTopOverlayView.window == self.window;
-    if (!_isBeingRecycled && _topScrollEdgeHard && self.window != nil &&
-        (localOverlayReady || externalOverlayReady)) {
-      [self updateTopScrollEdgeForScrollView:_observedScrollView];
-    }
-  }
-  [self updateScrollEdgeContentMasks];
   [_mountingRemovedScrollViews removeAllObjects];
   if (!_nativeSmoothHeaderScrollEnabled || _isBeingRecycled || self.window == nil ||
       _currentIndex < 0 || _currentIndex >= _pageControllers.count) return;
@@ -2728,11 +2214,7 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   if (_isBeingRecycled) return;
   NSInteger safeIndex = MIN(MAX(index, 0), _logicalChildren.count);
   [_logicalChildren insertObject:childComponentView atIndex:safeIndex];
-  if (_topScrollEdgeHard || _topOverlayView != nil) {
-    _needsSlotRebuild = YES;
-  } else {
-    [self rebuildSlots];
-  }
+  [self rebuildSlots];
 }
 
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView
@@ -2743,32 +2225,16 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   if (existingIndex == NSNotFound) return;
   [childComponentView removeFromSuperview];
   [_logicalChildren removeObjectAtIndex:existingIndex];
-  if (_topScrollEdgeHard || _topOverlayView != nil) {
-    _needsSlotRebuild = YES;
-  } else {
-    [self rebuildSlots];
-  }
+  [self rebuildSlots];
 }
 
 - (void)rebuildSlots
 {
-  if (_deferTopEdgeSlotRebuild) {
-    _needsSlotRebuild = YES;
-    return;
-  }
   if (_transitioning || _isPagerDragging) {
     _needsSlotRebuild = YES;
     return;
   }
-  if (_topScrollEdgeHard &&
-      _logicalChildren.count != _pageKeys.count + 2 &&
-      _logicalChildren.count != _pageKeys.count + 3) {
-    _needsSlotRebuild = YES;
-    return;
-  }
   _needsSlotRebuild = NO;
-  _deferTopEdgeSlotRebuild = NO;
-  [self restoreScrollEdgeContentMasks];
   [self detachScrollObserver];
   [self restoreSharedHeadersToContainer];
   // OneKey patch: Fabric reuses these views without resetting transforms
@@ -2780,15 +2246,11 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   _nativeSubHeaderView.transform = CGAffineTransformIdentity;
   [_headerView removeFromSuperview];
   [_stickyHeaderView removeFromSuperview];
-  [self updateTopScrollEdgeForScrollView:nil];
-  [_topOverlayView removeFromSuperview];
   for (UIViewController *controller in _pageControllers) {
     [controller.view removeFromSuperview];
   }
   _headerView = nil;
   _stickyHeaderView = nil;
-  _topOverlayView = nil;
-  [self updateTopScrollEdgeForScrollView:nil];
   [_pageControllers removeAllObjects];
 
   if (_logicalChildren.count > 0) {
@@ -2799,15 +2261,7 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
     _stickyHeaderView = _logicalChildren[1];
     [_sharedHeaderHostView addSubview:_stickyHeaderView];
   }
-  BOOL hasOverlaySlot = _topScrollEdgeHard &&
-    _logicalChildren.count == _pageKeys.count + 3;
-  NSInteger pageSlotStart = hasOverlaySlot ? 3 : 2;
-  if (hasOverlaySlot) {
-    _topOverlayView = _logicalChildren[2];
-    [_topOverlayHostView addSubview:_topOverlayView];
-  }
-  [self resolveExternalTopOverlay];
-  for (NSInteger index = pageSlotStart; index < _logicalChildren.count; index++) {
+  for (NSInteger index = 2; index < _logicalChildren.count; index++) {
     UIView *page = _logicalChildren[index];
     UIViewController *controller = [UIViewController new];
     [controller.view addSubview:page];
@@ -2846,10 +2300,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   if (!_nativeTabBarView.hidden) [_sharedHeaderHostView bringSubviewToFront:_nativeTabBarView];
   if (!_nativeSubHeaderView.hidden) [_sharedHeaderHostView bringSubviewToFront:_nativeSubHeaderView];
   [_containerView bringSubviewToFront:_sharedHeaderHostView];
-  if (_stickyHeaderIsPinned) {
-    [_pinnedStickyHostView.superview bringSubviewToFront:_pinnedStickyHostView];
-  }
-  if (self.hasFixedTopOverlay) [_containerView bringSubviewToFront:_topOverlayHostView];
   [self setNeedsLayout];
   dispatch_async(dispatch_get_main_queue(), ^{
     if (!self->_isBeingRecycled) {
@@ -2862,10 +2312,7 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
 - (void)layoutSubviews
 {
   [super layoutSubviews];
-  [self syncScrollEdgeAppearance];
   _containerView.frame = self.bounds;
-  [self registerExternalOuterPager];
-  BOOL externalHeightChanged = [self resolveExternalTopOverlay];
   if (_directNativePagerEnabled) {
     _pagerScrollView.frame = _containerView.bounds;
   } else {
@@ -2928,9 +2375,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
     }
   }
   [self layoutSharedHeaders];
-  if (externalHeightChanged) [self reapplyInsetsToObservedScrollView];
-  [self updateTopScrollEdgeForScrollView:_observedScrollView];
-  [self updateScrollEdgeContentMasks];
   [self updateHeaderSettledStateForceBusy:NO];
   dispatch_async(dispatch_get_main_queue(), ^{
     if (!self->_isBeingRecycled) {
@@ -2942,16 +2386,9 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
 
 - (void)prepareForRecycle
 {
-  [_externalOuterPager removeNestedOverlayObserver:self];
-  _externalOuterPager = nil;
-  [self cancelTopInsetReboundCheck];
-  [self restoreScrollEdgeContentMasks];
-  [self updateTopScrollEdgeForScrollView:nil];
   [self cancelHeaderSettledCheck];
   [self publishHeaderSettledAtTop:NO identityChanged:NO];
   _isBeingRecycled = YES;
-  _pendingTopOverlayAppearanceCommit = NO;
-  [self syncScrollEdgeAppearance];
   _generation++;
   [_mountingRemovedScrollViews removeAllObjects];
   _needsScrollObserverReattachAfterMount = NO;
@@ -2971,7 +2408,9 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
       if (appliedTop != nil && scrollView.refreshControl != nil) {
         original.top += MAX(0, scrollView.contentInset.top - appliedTop.doubleValue);
       }
+      [self offsetDiag:@"release-original-inset-before" page:_currentIndex scroll:scrollView];
   scrollView.contentInset = original;
+  [self offsetDiag:@"release-original-inset-after" page:_currentIndex scroll:scrollView];
     }
     NSValue *indicatorValue = [_originalIndicatorInsets objectForKey:scrollView];
     if (indicatorValue != nil) {
@@ -3000,7 +2439,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   _nativeSubHeaderView.transform = CGAffineTransformIdentity;
   [_headerView removeFromSuperview];
   [_stickyHeaderView removeFromSuperview];
-  [_topOverlayView removeFromSuperview];
   for (UIViewController *controller in _pageControllers) {
     [controller.view removeFromSuperview];
   }
@@ -3008,9 +2446,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   [_pageControllers removeAllObjects];
   _headerView = nil;
   _stickyHeaderView = nil;
-  _topOverlayView = nil;
-  _topOverlayHostView.hidden = YES;
-  [self updateTopScrollEdgeForScrollView:nil];
   _pageViewController.dataSource = nil;
   _pageViewController.delegate = nil;
   _pagerScrollView.delegate = nil;
@@ -3043,13 +2478,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   _pendingInitialPage = 0;
   _headerHeight = 0;
   _stickyHeaderHeight = 0;
-  _topOverlayHeight = 0;
-  _externalTopOverlayTag = 0;
-  _externalTopOverlayView = nil;
-  _externalTopOverlayHeight = 0;
-  _externalOuterPageActive = NO;
-  _externalOuterTransitioning = NO;
-  _topScrollEdgeHard = NO;
   _nativeTabBarHeight = 44;
   _nativeSubHeaderHeight = 74;
   _headerOffset = 0;
@@ -3073,7 +2501,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   _pendingGoToIndex = -1;
   _pendingGoToAnimated = YES;
   _needsSlotRebuild = NO;
-  _deferTopEdgeSlotRebuild = NO;
   _hasAppliedInitialPage = NO;
   // OneKey patch: Fabric retains old props when recycling this view.
   _needsPropsReapply = YES;
@@ -3090,9 +2517,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
 {
   const auto &oldViewProps = *std::static_pointer_cast<const RNCCollapsiblePagerViewProps>(_props);
   const auto &newViewProps = *std::static_pointer_cast<const RNCCollapsiblePagerViewProps>(props);
-  _applyingTopOverlayInsetChange =
-    oldViewProps.topScrollEdgeHard != newViewProps.topScrollEdgeHard ||
-    oldViewProps.topOverlayHeight != newViewProps.topOverlayHeight;
 
   if (_needsPropsReapply || oldViewProps.initialPage != newViewProps.initialPage) {
     _pendingInitialPage = MAX(0, newViewProps.initialPage);
@@ -3142,43 +2566,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
     _stickyHeaderHeight = MAX(0, newViewProps.stickyHeaderHeight);
     insetsChanged = YES;
   }
-  if (_needsPropsReapply || oldViewProps.topScrollEdgeHard != newViewProps.topScrollEdgeHard) {
-    _topScrollEdgeHard = newViewProps.topScrollEdgeHard;
-    if (oldViewProps.topScrollEdgeHard || newViewProps.topScrollEdgeHard) {
-      _deferTopEdgeSlotRebuild = YES;
-      [self rebuildSlots];
-      NSUInteger generation = _generation;
-      dispatch_async(dispatch_get_main_queue(), ^{
-        if (self->_generation != generation || self->_isBeingRecycled ||
-            !self->_deferTopEdgeSlotRebuild) return;
-        self->_deferTopEdgeSlotRebuild = NO;
-        [self rebuildSlots];
-      });
-    }
-    insetsChanged = YES;
-  }
-  if (_needsPropsReapply ||
-      oldViewProps.topOverlayColorScheme != newViewProps.topOverlayColorScheme) {
-    NSString *nextScheme = RCTNSStringFromString(newViewProps.topOverlayColorScheme);
-    if (self.hasFixedTopOverlay && _topScrollEdgeHard &&
-        _topOverlayColorScheme != nil &&
-        ![_topOverlayColorScheme isEqualToString:nextScheme]) {
-      _pendingTopOverlayAppearanceCommit = YES;
-      [self updateTopScrollEdgeForScrollView:nil];
-    }
-    _topOverlayColorScheme = nextScheme;
-    [self syncScrollEdgeAppearance];
-  }
-  if (_needsPropsReapply || oldViewProps.topOverlayHeight != newViewProps.topOverlayHeight) {
-    _topOverlayHeight = MAX(0, newViewProps.topOverlayHeight);
-    insetsChanged = YES;
-  }
-  if (_needsPropsReapply ||
-      oldViewProps.externalTopOverlayTag != newViewProps.externalTopOverlayTag) {
-    _externalTopOverlayTag = newViewProps.externalTopOverlayTag;
-    [self registerExternalOuterPager];
-    insetsChanged = [self resolveExternalTopOverlay] || insetsChanged;
-  }
   if (_needsPropsReapply || oldViewProps.pageKeys != newViewProps.pageKeys) {
     NSString *json = RCTNSStringFromString(newViewProps.pageKeys);
     NSData *data = [json dataUsingEncoding:NSUTF8StringEncoding];
@@ -3246,23 +2633,17 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
 
   _needsPropsReapply = NO;
   [super updateProps:props oldProps:oldProps];
-  [self updateTopScrollEdgeForScrollView:_observedScrollView];
   if (insetsChanged) {
     [self reapplyInsetsToObservedScrollView];
     [self setNeedsLayout];
   }
-  _applyingTopOverlayInsetChange = NO;
   if (!_nativeTabBarView.hidden) {
-    [_nativeTabBarView.superview bringSubviewToFront:_nativeTabBarView];
+    [_sharedHeaderHostView bringSubviewToFront:_nativeTabBarView];
   }
   if (!_nativeSubHeaderView.hidden) {
-    [_nativeSubHeaderView.superview bringSubviewToFront:_nativeSubHeaderView];
+    [_sharedHeaderHostView bringSubviewToFront:_nativeSubHeaderView];
   }
   [_sharedHeaderHostView.superview bringSubviewToFront:_sharedHeaderHostView];
-  if (_stickyHeaderIsPinned) {
-    [_pinnedStickyHostView.superview bringSubviewToFront:_pinnedStickyHostView];
-  }
-  if (self.hasFixedTopOverlay) [_containerView bringSubviewToFront:_topOverlayHostView];
 }
 
 #pragma mark - Collapsible scroll coordination
@@ -3496,17 +2877,21 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
     return;
   }
 
+  [self offsetDiag:@"observer-candidate" page:_currentIndex scroll:candidate];
   BOOL replacingCurrentScrollView = _observingContentOffset &&
     (!_nativeSmoothHeaderScrollEnabled || [_observedPageKey isEqualToString:self.currentPageKey]);
   [self detachScrollObserver];
   if (replacingCurrentScrollView) {
     // Legacy replacement discards body state; smooth replacement waits for layout.
+    [self offsetDiag:@"observer-replacement-cache-before" page:_currentIndex scroll:candidate];
     if (!_nativeSmoothHeaderScrollEnabled) _pageOffsets[self.currentPageKey] = @(_headerOffset);
+    [self offsetDiag:@"observer-replacement-cache-after" page:_currentIndex scroll:candidate];
   }
   _observedScrollView = candidate;
   _observedPageKey = [self.currentPageKey copy];
   _observedPageIndex = _currentIndex;
   _observedPageGeneration = _generation;
+  [self offsetDiag:@"observer-attached-before-restore" page:_currentIndex scroll:candidate];
   [self applyInsetsToScrollView:candidate pageIndex:_currentIndex restore:YES];
   [candidate addObserver:self
               forKeyPath:@"contentOffset"
@@ -3524,7 +2909,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   _observingContentOffset = YES;
   _needsScrollObserverReattachAfterMount = NO;
   _currentLogicalOffset = candidate.contentOffset.y + candidate.contentInset.top;
-  [self updateTopScrollEdgeForScrollView:candidate];
   [self attachSharedHeadersToScrollView:candidate];
   [self updateSharedHeaderPressCancellationGesture];
   [self updateHeaderSettledStateForceBusy:NO];
@@ -3532,9 +2916,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
 
 - (void)detachScrollObserver
 {
-  [self cancelTopInsetReboundCheck];
-  [self restorePinnedStickyHeader];
-  [self updateTopScrollEdgeForScrollView:nil];
   [self cancelHeaderSettledCheck];
   _headerCommandOwner = nil;
   _headerSettledGeometry = nil;
@@ -3544,6 +2925,7 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   UIScrollView *scrollView = _observedScrollView;
   if (scrollView != nil) {
     [scrollView.panGestureRecognizer removeTarget:self action:@selector(observedListPanChanged:)];
+    [self offsetDiag:@"detach-save-before" page:_currentIndex scroll:scrollView];
     NSString *ownerKey = _nativeSmoothHeaderScrollEnabled ? _observedPageKey : self.currentPageKey;
     BOOL ownerKeyExists = ownerKey != nil && ([_pageKeys containsObject:ownerKey] ||
       (_observedPageIndex >= 0 && _observedPageIndex < _pageControllers.count &&
@@ -3551,6 +2933,7 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
     if (ownerKey != nil && !_nativeSmoothHeaderScrollEnabled) {
       _pageOffsets[ownerKey] = @(scrollView.contentOffset.y + scrollView.contentInset.top);
     }
+    [self offsetDiag:@"detach-save-after" page:_currentIndex scroll:scrollView];
     if (_observingContentOffset) {
       [scrollView removeObserver:self
                       forKeyPath:@"contentOffset"
@@ -3592,9 +2975,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
       removeGestureRecognizer:_sharedHeaderOuterPagerGesture];
   }
   _sharedHeaderOuterPagerGesture.blockedPagerGestures = nil;
-  _sharedHeaderOuterPagerGesture.trackedTouch = nil;
-  _sharedHeaderOuterPagerGesture.protectsNestedBody = NO;
-  _sharedHeaderOuterPagerGesture.cancelsTouchesInView = YES;
   _sharedHeaderPressCancellationGestureHost = nil;
   _reactTouchHandler = nil;
 }
@@ -3644,7 +3024,7 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
     }
   }
   if (_sharedHeaderPressCancellationGesture.view == gestureHost &&
-      _sharedHeaderOuterPagerGesture.view == _containerView &&
+      _sharedHeaderOuterPagerGesture.view == _sharedHeaderHostView &&
       _reactTouchHandler == reactTouchHandler) {
     _sharedHeaderOuterPagerGesture.blockedPagerGestures = outerPagerGestures;
     return;
@@ -3686,7 +3066,7 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   _reactTouchHandler = reactTouchHandler;
   _sharedHeaderPressCancellationGestureHost = gestureHost;
   [gestureHost addGestureRecognizer:_sharedHeaderPressCancellationGesture];
-  [_containerView addGestureRecognizer:_sharedHeaderOuterPagerGesture];
+  [_sharedHeaderHostView addGestureRecognizer:_sharedHeaderOuterPagerGesture];
   RNCCollapsiblePagerLog([NSString stringWithFormat:
     @"press-cancel-bridge attached=1 outer-pagers=%lu",
     (unsigned long)outerPagerGestures.count]);
@@ -3758,11 +3138,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
 
 - (void)observedListPanChanged:(UIPanGestureRecognizer *)recognizer
 {
-  if (recognizer == _pendingTopInsetReboundScrollView.panGestureRecognizer &&
-      (recognizer.state == UIGestureRecognizerStateBegan ||
-       recognizer.state == UIGestureRecognizerStateChanged)) {
-    [self cancelTopInsetReboundCheck];
-  }
   if (recognizer == _observedScrollView.panGestureRecognizer) {
     [self updateHeaderSettledStateForceBusy:
       recognizer.state == UIGestureRecognizerStateBegan || recognizer.state == UIGestureRecognizerStateChanged];
@@ -3830,7 +3205,7 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
     [_managedRefreshControls removeObjectForKey:scrollView];
     if (current != nil) [_managedRefreshControls setObject:current forKey:scrollView];
   }
-  [RNCRefreshControlOffsetState setOffset:self.effectiveTopOverlayHeight + _headerHeight + _stickyHeaderHeight
+  [RNCRefreshControlOffsetState setOffset:_headerHeight + _stickyHeaderHeight
                              forControl:current owner:self];
 }
 
@@ -3844,53 +3219,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   [_managedRefreshControls removeObjectForKey:scrollView];
 }
 
-- (void)cancelTopInsetReboundCheck
-{
-  [_topInsetReboundTimer invalidate];
-  _topInsetReboundTimer = nil;
-  _pendingTopInsetReboundScrollView = nil;
-  _pendingTopInsetReboundPageKey = nil;
-}
-
-- (void)scheduleTopInsetReboundCheck
-{
-  if (_pendingTopInsetReboundScrollView == nil ||
-      _pendingTopInsetReboundScrollView != _observedScrollView) return;
-  [_topInsetReboundTimer invalidate];
-  __weak __typeof__(self) weakSelf = self;
-  _topInsetReboundTimer = [NSTimer scheduledTimerWithTimeInterval:0.15 repeats:NO block:^(NSTimer *timer) {
-    __strong __typeof__(weakSelf) self = weakSelf;
-    if (self == nil || self->_topInsetReboundTimer != timer) return;
-    self->_topInsetReboundTimer = nil;
-    UIScrollView *scrollView = self->_pendingTopInsetReboundScrollView;
-    if (scrollView == nil || scrollView != self->_observedScrollView ||
-        self->_pendingTopInsetReboundGeneration != self->_generation ||
-        ![self->_pendingTopInsetReboundPageKey isEqualToString:self.currentPageKey] ||
-        self->_isBeingRecycled || self.window == nil ||
-        self->_transitioning || self->_isPagerDragging ||
-        self->_headerCommandOwner == scrollView || self->_pagerTopPageKey != nil) {
-      [self cancelTopInsetReboundCheck];
-      return;
-    }
-    UIGestureRecognizerState pan = scrollView.panGestureRecognizer.state;
-    if (scrollView.refreshControl.isRefreshing || scrollView.isDragging ||
-        scrollView.isDecelerating || scrollView.isTracking ||
-        pan == UIGestureRecognizerStateBegan || pan == UIGestureRecognizerStateChanged ||
-        self->_syntheticPageRestore || self->_transitionPageOffsets != nil) {
-      [self scheduleTopInsetReboundCheck];
-      return;
-    }
-    CGFloat minimumOffset = -scrollView.adjustedContentInset.top;
-    [self cancelTopInsetReboundCheck];
-    if (scrollView.contentOffset.y < minimumOffset - 0.5) {
-      // UIKit can finish a refresh rebound at the inset that preceded an overlay resize.
-      self->_correctingTopInsetRebound = YES;
-      [scrollView setContentOffset:CGPointMake(scrollView.contentOffset.x, minimumOffset) animated:NO];
-      self->_correctingTopInsetRebound = NO;
-    }
-  }];
-}
-
 // OneKey patch: release observers, headers and saved state while the scroll view
 // still represents the old list, before Fabric applies its next owner's props.
 - (void)restoreScrollViewState:(UIScrollView *)scrollView resetSavedOffset:(BOOL)resetSavedOffset
@@ -3899,7 +3227,9 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   [self releaseRefreshControlForScrollView:scrollView];
   if (scrollView == _observedScrollView) {
     [self detachScrollObserver];
+    [self offsetDiag:resetSavedOffset ? @"release-reset-before" : @"release-retain-before" page:_currentIndex scroll:scrollView];
     if (resetSavedOffset && !_nativeSmoothHeaderScrollEnabled) _pageOffsets[self.currentPageKey] = @(_headerOffset);
+    [self offsetDiag:@"release-reset-after" page:_currentIndex scroll:scrollView];
   }
   if (scrollView == _sharedHeaderScrollView) {
     [self restoreSharedHeadersToContainer];
@@ -3919,8 +3249,10 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
     [_originalDirectionalLockEnabled objectForKey:scrollView].boolValue;
   scrollView.contentInsetAdjustmentBehavior = (UIScrollViewContentInsetAdjustmentBehavior)
     [_originalInsetAdjustmentBehavior objectForKey:scrollView].integerValue;
+  [self offsetDiag:@"release-original-offset-before" page:_currentIndex scroll:scrollView];
   [scrollView setContentOffset:CGPointMake(scrollView.contentOffset.x, logicalOffset - original.top)
                      animated:NO];
+  [self offsetDiag:@"release-original-offset-after" page:_currentIndex scroll:scrollView];
   [_originalInsets removeObjectForKey:scrollView];
   [_appliedTopInsets removeObjectForKey:scrollView];
   [_originalIndicatorInsets removeObjectForKey:scrollView];
@@ -3951,6 +3283,7 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
 {
   // Smooth pages retain their complete offset while replacement identity and
   // layout settle. Legacy pages retain the historical header-only policy.
+  [self offsetDiag:restore ? @"restore-enter" : @"insets-enter" page:pageIndex scroll:scrollView];
   NSString *pageKey = [self pageKeyForIndex:pageIndex];
   RNCCollapsiblePagerReleasedScrollState *released = _releasedPageScrollStates[pageKey];
   BOOL deferredReleasedIdentity = NO;
@@ -3996,8 +3329,13 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
       deferredReleasedIdentity = now - released.pendingFallbackDetectedAt <
         RNCCollapsiblePagerFallbackDebounceInterval;
     }
+#if DEBUG
+    [self offsetDiag:[NSString stringWithFormat:@"released-identity-match=%d-deferred=%d-oldTag=%ld-oldScroll=%p", sameList, deferredReleasedIdentity, (long)released.componentTag, (__bridge void *)released.scrollView] page:pageIndex scroll:scrollView];
+#endif
     if (!deferredReleasedIdentity) {
+      [self offsetDiag:@"released-identity-cache-before" page:pageIndex scroll:scrollView];
       if (!sameList && !_nativeSmoothHeaderScrollEnabled) _pageOffsets[pageKey] = @(_headerOffset);
+      [self offsetDiag:@"released-identity-cache-after" page:pageIndex scroll:scrollView];
       [_releasedPageScrollStates removeObjectForKey:pageKey];
     }
   }
@@ -4022,24 +3360,22 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   // suppress its later vertical movement while the pager is still pending.
   scrollView.directionalLockEnabled = _nativeSmoothHeaderScrollEnabled
     ? NO : [_originalDirectionalLockEnabled objectForKey:scrollView].boolValue;
-  [self updateNativeScrollerViewport:scrollView stickyHeight:_stickyHeaderHeight + self.effectiveTopOverlayHeight];
+  [self updateNativeScrollerViewport:scrollView stickyHeight:_stickyHeaderHeight];
   [self updateRefreshControlForScrollView:scrollView];
   CGFloat previousTopInset = scrollView.contentInset.top;
   CGFloat previousLogicalOffset = scrollView.contentOffset.y + previousTopInset;
-  // Preserve UIKit's rebound after refresh while the content is beyond its top inset.
-  BOOL wasReturningFromPull = scrollView.contentOffset.y < -scrollView.adjustedContentInset.top - 0.5;
   NSNumber *appliedTop = [_appliedTopInsets objectForKey:scrollView];
   // UIRefreshControl owns its temporary top inset, including while ending.
   CGFloat refreshInset = appliedTop != nil && scrollView.refreshControl != nil
     ? MAX(0, previousTopInset - appliedTop.doubleValue) : 0;
   UIEdgeInsets next = original;
-  next.top += self.effectiveTopOverlayHeight + _headerHeight + _stickyHeaderHeight;
+  next.top += _headerHeight + _stickyHeaderHeight;
   CGFloat pagerTopInset = next.top;
   next.top += refreshInset;
   [_appliedTopInsets setObject:@(pagerTopInset) forKey:scrollView];
   // Short pages still need enough range to collapse the header; long pages
   // must end at the last row rather than leave a header-sized blank footer.
-  next.bottom += MAX(0, scrollView.bounds.size.height - _stickyHeaderHeight - self.effectiveTopOverlayHeight
+  next.bottom += MAX(0, scrollView.bounds.size.height - _stickyHeaderHeight
     - original.top - original.bottom - scrollView.contentSize.height);
   if (UIEdgeInsetsEqualToEdgeInsets(scrollView.contentInset, next) && !restore) {
     // UICollectionView may report contentSize during a bounce without changing
@@ -4049,7 +3385,9 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   }
   BOOL previousSyntheticRestore = _syntheticPageRestore;
   if (_nativeSmoothHeaderScrollEnabled || [_alignedBodyKeys containsObject:pageKey]) _syntheticPageRestore = YES;
+  [self offsetDiag:@"inset-assignment-before" page:pageIndex scroll:scrollView];
   scrollView.contentInset = next;
+  [self offsetDiag:@"inset-assignment-after" page:pageIndex scroll:scrollView];
   UIEdgeInsets indicatorInsets = scrollView.verticalScrollIndicatorInsets;
   indicatorInsets.top = pagerTopInset;
   scrollView.verticalScrollIndicatorInsets = indicatorInsets;
@@ -4081,6 +3419,9 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
     } else {
       restoredLogicalOffset = deferredReleasedIdentity || saved == nil ? _headerOffset : saved.doubleValue;
     }
+#if DEBUG
+    [self offsetDiag:[NSString stringWithFormat:@"restore-candidate-saved=%.4f-headerAlignedLogical=%.4f", saved.doubleValue, restoredLogicalOffset] page:pageIndex scroll:scrollView];
+#endif
     intendedLogicalOffset = restoredLogicalOffset;
     // Cancellation restores the visible source, while retaining its unreachable reading intent.
     if (_nativeSmoothHeaderScrollEnabled && _headerOffset >= _headerHeight &&
@@ -4093,6 +3434,9 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
     }
     // An inactive list may shrink after its offset observer was detached.
     // Do not overwrite its corrected offset with a now-unreachable cached one.
+#if DEBUG
+    [self offsetDiag:[NSString stringWithFormat:@"restore-clamp-before-candidate=%.4f-max=%.4f", targetOffset, MAX(-next.top, scrollView.contentSize.height - scrollView.bounds.size.height + next.bottom)] page:pageIndex scroll:scrollView];
+#endif
     targetOffset = RNCLimitRestoredScrollOffset(
       targetOffset,
       scrollView.contentSize.height,
@@ -4101,17 +3445,13 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
       next.bottom
     );
   }
+#if DEBUG
+  [self offsetDiag:[NSString stringWithFormat:@"restore-final-target=%.4f-restore=%d", targetOffset, restore] page:pageIndex scroll:scrollView];
+#endif
   // A bottom-inset change must not cancel UIKit's refresh or bounce settlement.
-  if (restore || (previousTopInset != next.top && !wasReturningFromPull)) {
+  if (restore || previousTopInset != next.top) {
     [scrollView setContentOffset:CGPointMake(scrollView.contentOffset.x, targetOffset) animated:NO];
   }
-  if (_applyingTopOverlayInsetChange && !restore && wasReturningFromPull &&
-      previousTopInset != next.top && scrollView == _observedScrollView) {
-    _pendingTopInsetReboundScrollView = scrollView;
-    _pendingTopInsetReboundPageKey = [pageKey copy];
-    _pendingTopInsetReboundGeneration = _generation;
-    [self scheduleTopInsetReboundCheck];
-  }
   if (_nativeSmoothHeaderScrollEnabled && restore && targetOffset + next.top + 0.5 < intendedLogicalOffset) {
     [_pendingPageRestoreKeys addObject:pageKey];
   }
@@ -4121,6 +3461,7 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
     if (!_nativeSmoothHeaderScrollEnabled) [self updateHeaderForScrollView:scrollView];
     else [self applyHeaderOffset];
   }
+  [self offsetDiag:@"restore-post" page:pageIndex scroll:scrollView];
 }
 
 - (void)updateNativeScrollerViewport:(UIScrollView *)scrollView stickyHeight:(CGFloat)height
@@ -4137,7 +3478,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
       _observedPageKey == nil || ![_observedPageKey isEqualToString:self.currentPageKey] ||
       _observedPageIndex != _currentIndex || _observedPageGeneration != _generation ||
       _transitioning || _isPagerDragging || _transitionPageOffsets != nil || _syntheticPageRestore) return;
-  [self cancelTopInsetReboundCheck];
   NSInteger phase = [notification.userInfo[@"phase"] integerValue];
   [self updateHeaderSettledStateForceBusy:NO];
   if (phase == 1) _headerCommandOwner = scrollView;
@@ -4170,6 +3510,7 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
     _headerOffset = 0;
     [self applyHeaderOffset];
   }
+  [self offsetDiag:@"list-command-body-takeover" page:_currentIndex scroll:scrollView];
 }
 
 - (void)nativeScrollerWillReceiveScrollCommand:(RNCNativeScrollerComponentView *)scroller
@@ -4181,12 +3522,12 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
       _observedPageIndex != _currentIndex || _currentIndex < 0 || _currentIndex >= _pageControllers.count ||
       _observedPageGeneration != _generation || _transitioning || _isPagerDragging ||
       _transitionPageOffsets != nil || _syntheticPageRestore) return;
-  [self cancelTopInsetReboundCheck];
   if (!_dispatchingPagerTop) {
     [self cancelPagerTop];
     [_alignedBodyKeys removeObject:ownerKey];
   }
   if (!_nativeSmoothHeaderScrollEnabled) return;
+  [self offsetDiag:@"command-pending-cancel-before" page:_observedPageIndex scroll:scrollView];
   [_pendingPageRestoreKeys removeObject:ownerKey];
   _currentLogicalOffset = scrollView.contentOffset.y + scrollView.contentInset.top;
   [_commandBodyKeys removeObject:ownerKey];
@@ -4195,6 +3536,7 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   [_displayBodyOverrides removeObjectForKey:ownerKey];
   _pageOffsets[ownerKey] = @(MAX(_currentLogicalOffset - _headerHeight, 0));
   [self updateHeaderForScrollView:scrollView];
+  [self offsetDiag:@"command-pending-cancel-after" page:_observedPageIndex scroll:scrollView];
 }
 
 
@@ -4256,14 +3598,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
     return;
   }
   if (context == RNCCollapsiblePagerContentOffsetContext && object == _observedScrollView) {
-    if (_pendingTopInsetReboundScrollView == object &&
-        ([keyPath isEqualToString:@"contentOffset"] || [keyPath isEqualToString:@"contentInset"])) {
-      if (((UIScrollView *)object).panGestureRecognizer.state == UIGestureRecognizerStateChanged) {
-        [self cancelTopInsetReboundCheck];
-      } else {
-        [self scheduleTopInsetReboundCheck];
-      }
-    }
     if (![change[NSKeyValueChangeOldKey] isEqual:change[NSKeyValueChangeNewKey]]) {
       [self updateHeaderSettledStateForceBusy:YES];
     }
@@ -4328,12 +3662,18 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
     }
     UIScrollView *scrollView = (UIScrollView *)object;
     _currentLogicalOffset = scrollView.contentOffset.y + scrollView.contentInset.top;
-    if (_correctingTopInsetRebound) return;
+#if DEBUG
+    BOOL offsetDiagChanged = _pageOffsets[self.currentPageKey] == nil || _pageOffsets[self.currentPageKey].doubleValue != (_nativeSmoothHeaderScrollEnabled ? MAX(_currentLogicalOffset - _headerHeight, 0) : _currentLogicalOffset);
+    if (offsetDiagChanged) [self offsetDiag:@"kvo-cache-before" page:_currentIndex scroll:scrollView];
+#endif
     if ([_alignedBodyKeys containsObject:_observedPageKey] ||
         (_nativeSmoothHeaderScrollEnabled && scrollView.panGestureRecognizer.state != UIGestureRecognizerStateChanged &&
          !scrollView.isDecelerating && ![_commandBodyKeys containsObject:_observedPageKey])) return;
     _pageOffsets[_nativeSmoothHeaderScrollEnabled ? _observedPageKey : self.currentPageKey] =
       @(_nativeSmoothHeaderScrollEnabled ? MAX(_currentLogicalOffset - _headerHeight, 0) : _currentLogicalOffset);
+#if DEBUG
+    if (offsetDiagChanged) [self offsetDiag:@"kvo-cache-after" page:_currentIndex scroll:scrollView];
+#endif
     [self updateHeaderForScrollView:scrollView];
     return;
   }
@@ -4374,22 +3714,17 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
       ? MAX(0, scrollView.contentInset.top - appliedTop.doubleValue) : 0;
     CGFloat pinnedTranslation = MAX(0, _currentLogicalOffset - _headerHeight - refreshInset);
     CGAffineTransform stickyTransform = CGAffineTransformMakeTranslation(0, pinnedTranslation);
-    [self updatePinnedStickyHeader];
-    _stickyHeaderView.transform = _stickyHeaderIsPinned ? CGAffineTransformIdentity : stickyTransform;
-    _nativeTabBarView.transform = _stickyHeaderIsPinned ? CGAffineTransformIdentity : stickyTransform;
-    _nativeSubHeaderView.transform = _stickyHeaderIsPinned ? CGAffineTransformIdentity : stickyTransform;
-    [self updateScrollEdgeContentMasks];
+    _stickyHeaderView.transform = stickyTransform;
+    _nativeTabBarView.transform = stickyTransform;
+    _nativeSubHeaderView.transform = stickyTransform;
     return;
   }
-  [self updatePinnedStickyHeader];
   CGAffineTransform collapseTransform = CGAffineTransformMakeTranslation(0, -_headerOffset);
   _sharedHeaderHostView.transform = collapseTransform;
   _headerView.transform = CGAffineTransformIdentity;
   _stickyHeaderView.transform = CGAffineTransformIdentity;
   _nativeTabBarView.transform = CGAffineTransformIdentity;
   _nativeSubHeaderView.transform = CGAffineTransformIdentity;
-  [self updateTopScrollEdgeForScrollView:_observedScrollView];
-  [self updateScrollEdgeContentMasks];
 }
 
 #pragma mark - Pager navigation
@@ -4401,7 +3736,7 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
 
 - (void)goTo:(NSInteger)index animated:(BOOL)animated
 {
-  [self cancelTopInsetReboundCheck];
+  [self offsetDiag:@"go-to" page:index scroll:_observedScrollView];
   if (_isBeingRecycled || index < 0 || index >= _pageControllers.count) return;
   _hasReceivedPageCommand = YES;
   _hasAppliedInitialPage = YES;
@@ -4532,7 +3867,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
     if (!self->_transitioning && !self->_needsSlotRebuild) {
       [self attachScrollObserverForCurrentPage];
     }
-    [self updateScrollEdgeContentMasks];
   });
 }
 
@@ -4584,6 +3918,7 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
 - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView
 {
   [self updateHeaderSettledStateForceBusy:YES];
+  [self offsetDiag:@"pager-drag-begin" page:_currentIndex scroll:_observedScrollView];
   if (_nativeSmoothHeaderScrollEnabled && scrollView == _pagerScrollView) {
     [_contentPressCancellationGesture cancelPressForPan:scrollView.panGestureRecognizer];
   }
@@ -4740,7 +4075,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
     CGFloat offset = progress - position;
     position = MAX(0, MIN(position, (NSInteger)_pageControllers.count - 1));
     [self updatePageStateTransitionProgress:progress];
-    [self updateScrollEdgeContentMasks];
     [_nativeTabBarView setProgress:progress];
     const auto emitter = [self eventEmitter];
     if (emitter) {
@@ -4759,7 +4093,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
     tabProgress = _currentIndex + (_destinationIndex - _currentIndex) * transitionProgress;
   }
   [self updatePageStateTransitionProgress:tabProgress];
-  [self updateScrollEdgeContentMasks];
   [_nativeTabBarView setProgress:tabProgress];
   const auto emitter = [self eventEmitter];
   if (emitter) {
@@ -4777,6 +4110,7 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
 
 - (void)emitPageSelected:(NSInteger)position
 {
+  [self offsetDiag:@"selection-complete" page:position scroll:_observedScrollView];
   const auto emitter = [self eventEmitter];
   if (emitter) emitter->onPageSelected({.position = (double)position});
 }
@@ -4921,12 +4255,12 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   _currentLogicalOffset = logical;
   _headerOffset = _pagerTopLogicalTarget;
   [self applyHeaderOffset];
+  [self offsetDiag:[NSString stringWithFormat:@"pager-top-complete-token=%lu-target=%.4f", (unsigned long)_pagerTopToken, _pagerTopLogicalTarget] page:_currentIndex scroll:scrollView];
   [self cancelPagerTop];
 }
 
 - (void)scrollToTop:(NSInteger)target animated:(BOOL)animated
 {
-  [self cancelTopInsetReboundCheck];
   UIScrollView *scrollView = _observedScrollView;
   NSString *key = _observedPageKey;
   if ((target != 0 && target != 1) || _isBeingRecycled || _transitioning || _isPagerDragging ||
@@ -4958,6 +4292,7 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   [self applyHeaderOffset];
   CGFloat physicalTarget = RNCLimitRestoredScrollOffset(logicalTarget - scrollView.contentInset.top,
     scrollView.contentSize.height, scrollView.bounds.size.height, scrollView.contentInset.top, scrollView.contentInset.bottom);
+  [self offsetDiag:[NSString stringWithFormat:@"pager-top-begin-token=%lu-target=%ld-animated=%d", (unsigned long)_pagerTopToken, (long)target, animated] page:_currentIndex scroll:scrollView];
   _dispatchingPagerTop = YES;
   [scrollView setContentOffset:CGPointMake(scrollView.contentOffset.x, physicalTarget) animated:animated];
   _dispatchingPagerTop = NO;
@@ -5022,22 +4357,6 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
       : velocity;
     BOOL hasMotion = MAX(fabs(intent.x), fabs(intent.y)) >= 1;
     BOOL horizontal = hasMotion && fabs(intent.x) > fabs(intent.y);
-    if (_sharedHeaderOuterPagerGesture.protectsNestedBody) {
-      NSInteger pageCount = _pageControllers.count;
-      BOOL validPage = _currentIndex >= 0 && _currentIndex < pageCount;
-      NSInteger firstPageIndex = self.isLtrLayout ? 0 : pageCount - 1;
-      NSInteger lastPageIndex = self.isLtrLayout ? pageCount - 1 : 0;
-      BOOL outward = validPage &&
-        ((_currentIndex == firstPageIndex && intent.x > 0) ||
-         (_currentIndex == lastPageIndex && intent.x < 0));
-      UIScrollView *outer = RNCNestedOuterReactPagerScrollView(self);
-      BOOL protectInnerPage = horizontal && validPage && pageCount > 1 &&
-        _nestedScrollEnabled && _scrollEnabled && _pagerScrollView.scrollEnabled &&
-        _pagerScrollView.panGestureRecognizer.enabled && outer != nil && outer.scrollEnabled &&
-        [_sharedHeaderOuterPagerGesture.blockedPagerGestures
-          containsObject:outer.panGestureRecognizer] && !outward;
-      return protectInnerPage;
-    }
     RNCCollapsiblePagerLog([NSString stringWithFormat:
       @"header-axis role=outer-pager-block dx=%.2f dy=%.2f velocity=(%.2f,%.2f) result=%d outer-pagers=%lu",
       intent.x,
@@ -5077,21 +4396,24 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
     return vertical;
   }
   if (gestureRecognizer != _blockerGesture) return YES;
-  UIPanGestureRecognizer *pan = [gestureRecognizer isKindOfClass:UIPanGestureRecognizer.class]
-    ? (UIPanGestureRecognizer *)gestureRecognizer : nil;
-  CGPoint velocity = pan != nil ? [pan velocityInView:self] : CGPointZero;
+  if (!_nestedScrollEnabled) return NO;
+  if (![gestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]]) return NO;
+
+  UIPanGestureRecognizer *pan = (UIPanGestureRecognizer *)gestureRecognizer;
+  CGPoint velocity = [pan velocityInView:self];
   NSInteger pageCount = _pageControllers.count;
+  if (pageCount == 0 || _currentIndex < 0 || _currentIndex >= pageCount) return NO;
+
   CGFloat absVelocityX = fabs(velocity.x);
   CGFloat absVelocityY = fabs(velocity.y);
-  NSInteger firstPageIndex = self.isLtrLayout ? 0 : pageCount - 1;
-  NSInteger lastPageIndex = self.isLtrLayout ? pageCount - 1 : 0;
-  BOOL validPage = pageCount > 0 && _currentIndex >= 0 && _currentIndex < pageCount;
-  BOOL horizontal = absVelocityX > absVelocityY && absVelocityX >= 1.0f;
-  BOOL outward = validPage &&
-    ((_currentIndex == firstPageIndex && velocity.x > 0) ||
-     (_currentIndex == lastPageIndex && velocity.x < 0));
-  BOOL shouldBegin = _nestedScrollEnabled && pan != nil && horizontal && outward;
-  return shouldBegin;
+  if (absVelocityX <= absVelocityY || absVelocityX < 1.0f) return NO;
+
+  BOOL isLtr = self.isLtrLayout;
+  NSInteger firstPageIndex = isLtr ? 0 : pageCount - 1;
+  NSInteger lastPageIndex = isLtr ? pageCount - 1 : 0;
+  if (_currentIndex == firstPageIndex && velocity.x > 0) return YES;
+  if (_currentIndex == lastPageIndex && velocity.x < 0) return YES;
+  return NO;
 }
 
 - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch
@@ -5101,29 +4423,13 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
         _sharedHeaderPressCancellationGestureHost == nil) return NO;
     UIView *touchView = touch.view;
     BOOL beginsInSharedHeader = touchView == _sharedHeaderHostView ||
-      [touchView isDescendantOfView:_sharedHeaderHostView] ||
-      touchView == _pinnedStickyHostView ||
-      [touchView isDescendantOfView:_pinnedStickyHostView];
-    if (_sharedHeaderOuterPagerGesture.trackedTouch != nil &&
-        _sharedHeaderOuterPagerGesture.trackedTouch != touch) return NO;
-    UIScrollView *outer = RNCNestedOuterReactPagerScrollView(self);
-    BOOL beginsInNestedBody = !beginsInSharedHeader && _nestedScrollEnabled &&
-      _scrollEnabled && _pagerScrollView.scrollEnabled &&
-      _pagerScrollView.panGestureRecognizer.enabled && _pageControllers.count > 1 &&
-      outer != nil && outer.scrollEnabled &&
-      [_sharedHeaderOuterPagerGesture.blockedPagerGestures containsObject:outer.panGestureRecognizer] &&
-      (touchView == _pagerScrollView || [touchView isDescendantOfView:_pagerScrollView]);
-    if (!beginsInSharedHeader && !beginsInNestedBody) return NO;
-
-    _sharedHeaderOuterPagerGesture.trackedTouch = touch;
-    _sharedHeaderOuterPagerGesture.protectsNestedBody = beginsInNestedBody;
-    _sharedHeaderOuterPagerGesture.cancelsTouchesInView = !beginsInNestedBody;
+      [touchView isDescendantOfView:_sharedHeaderHostView];
+    if (!beginsInSharedHeader) return NO;
 
     RNCCollapsiblePagerLog([NSString stringWithFormat:
-      @"outer-pager-touch target=%@ outer-pagers=%lu nested-body=%d",
+      @"outer-pager-touch target=%@ outer-pagers=%lu",
       touchView == nil ? @"none" : NSStringFromClass(touchView.class),
-      (unsigned long)_sharedHeaderOuterPagerGesture.blockedPagerGestures.count,
-      beginsInNestedBody]);
+      (unsigned long)_sharedHeaderOuterPagerGesture.blockedPagerGestures.count]);
     return YES;
   }
   if (gestureRecognizer == _contentPressCancellationGesture) {
@@ -5132,17 +4438,14 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
     return _nativeSmoothHeaderScrollEnabled && !_isBeingRecycled &&
       _contentPressCancellationGesture.view != nil &&
       [touchView isDescendantOfView:_pagerScrollView] &&
-      ![touchView isDescendantOfView:_sharedHeaderHostView] &&
-      ![touchView isDescendantOfView:_pinnedStickyHostView];
+      ![touchView isDescendantOfView:_sharedHeaderHostView];
   }
   if (gestureRecognizer == _sharedHeaderPressCancellationGesture) {
     if (!_nativeSmoothHeaderScrollEnabled || _isBeingRecycled ||
         _sharedHeaderPressCancellationGestureHost == nil) return NO;
     UIView *touchView = touch.view;
     BOOL beginsInSharedHeader = touchView == _sharedHeaderHostView ||
-      [touchView isDescendantOfView:_sharedHeaderHostView] ||
-      touchView == _pinnedStickyHostView ||
-      [touchView isDescendantOfView:_pinnedStickyHostView];
+      [touchView isDescendantOfView:_sharedHeaderHostView];
     if (!beginsInSharedHeader) return NO;
 
     RNCCollapsiblePagerLog([NSString stringWithFormat:
@@ -5153,9 +4456,7 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   if (gestureRecognizer == _verticalPagerGesture) {
     UIView *touchView = touch.view;
     return touchView != _sharedHeaderHostView &&
-      ![touchView isDescendantOfView:_sharedHeaderHostView] &&
-      touchView != _pinnedStickyHostView &&
-      ![touchView isDescendantOfView:_pinnedStickyHostView];
+      ![touchView isDescendantOfView:_sharedHeaderHostView];
   }
   // A new touch can cancel UIKit's animation before its first frame. Queue a
   // non-animated settle for the next safe transition boundary instead of