react-native-tvos 0.81.3-0 → 0.82.0-0

package/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.h

@@ -13,6 +13,8 @@
 #import <React/RCTScrollableProtocol.h>
 #import <React/RCTViewComponentView.h>
 
+#import "RCTVirtualViewContainerProtocol.h"
+
 NS_ASSUME_NONNULL_BEGIN
 
 /*
@@ -23,7 +25,8 @@ NS_ASSUME_NONNULL_BEGIN
  * keyboard-avoiding functionality and so on. All that complexity must be implemented inside those components in order
  * to keep the complexity of this component manageable.
  */
-@interface RCTScrollViewComponentView : RCTViewComponentView <RCTMountingTransactionObserving>
+@interface RCTScrollViewComponentView
+    : RCTViewComponentView <RCTMountingTransactionObserving, RCTVirtualViewContainerProtocol>
 
 /*
  * Finds and returns the closet RCTScrollViewComponentView component to the given view

package/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm

@@ -24,6 +24,7 @@
 #import "RCTCustomPullToRefreshViewProtocol.h"
 #import "RCTEnhancedScrollView.h"
 #import "RCTFabricComponentsPlugins.h"
+#import "RCTVirtualViewContainerState.h"
 
 #if TARGET_OS_TV
 #import <React/RCTTVRemoteHandler.h>
@@ -117,11 +118,23 @@ RCTSendScrollEventForNativeAnimations_DEPRECATED(UIScrollView *scrollView, NSInt
 
   CGRect _prevFirstVisibleFrame;
   __weak UIView *_firstVisibleView;
+  NSInteger _firstVisibleViewTag;
 
   CGFloat _endDraggingSensitivityMultiplier;
     
   BOOL _blockFirstTouch;
   NSMutableDictionary *_tvRemoteGestureRecognizers;
+
+  // A flag indicating that accessibility API is used.
+  // It is not restored to the default value in prepareForRecycle.
+  // Once an accessibility API is used, view culling will be disabled for the entire session.
+  BOOL _isAccessibilityAPIUsed;
+
+  // Flag to temporarily disable maintainVisibleContentPosition adjustments during immediate state updates
+  // to prevent conflicts between immediate content offset updates and visible content position logic
+  BOOL _avoidAdjustmentForMaintainVisibleContentPosition;
+
+  RCTVirtualViewContainerState *_virtualViewContainerState;
 }
 
 + (RCTScrollViewComponentView *_Nullable)findScrollViewComponentViewForView:(UIView *)view
@@ -144,6 +157,7 @@ RCTSendScrollEventForNativeAnimations_DEPRECATED(UIScrollView *scrollView, NSInt
     _isUserTriggeredScrolling = NO;
     _shouldUpdateContentInsetAdjustmentBehavior = YES;
     _automaticallyAdjustKeyboardInsets = NO;
+    _isAccessibilityAPIUsed = NO;
     [self addSubview:_scrollView];
 
     _containerView = [[UIView alloc] initWithFrame:CGRectZero];
@@ -613,24 +627,68 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
   return metrics;
 }
 
+/**
+ * When use of accessibility APIs is detected, view culling is disabled to make accessibility work correctly.
+ */
+- (void)_disableViewCullingIfNecessary
+{
+  if (!_isAccessibilityAPIUsed) {
+    _isAccessibilityAPIUsed = YES;
+    [self _updateStateWithContentOffset];
+  }
+}
+
+- (NSInteger)accessibilityElementCount
+{
+  // From empirical testing, method `accessibilityElementCount` is called lazily only
+  // when accessibility is used.
+  // Why we don't use UIAccessibilitySwitchControlStatusDidChangeNotification and
+  // UIAccessibilityVoiceOverStatusDidChangeNotification? The notifications are not called when using Accessibility
+  // Inspector. We anticipate developers will want to debug accessbility with Accessibility Inspector and don't want to
+  // break that developer workflow with view culling. Therefore, we are using API use detection to disable view culling
+  // instead of the notifications.
+  [self _disableViewCullingIfNecessary];
+  return [super accessibilityElementCount];
+}
+
+- (NSArray<id<UIFocusItem>> *)focusItemsInRect:(CGRect)rect
+{
+  // From empirical testing, method `focusItemsInRect:` is called lazily only
+  // when keyboard navigation is used.
+  [self _disableViewCullingIfNecessary];
+  return [super focusItemsInRect:rect];
+}
+
 - (void)_updateStateWithContentOffset
 {
   if (!_state) {
     return;
   }
 
+  BOOL enableImmediateUpdateModeForContentOffsetChanges =
+      ReactNativeFeatureFlags::enableImmediateUpdateModeForContentOffsetChanges();
+
+  _avoidAdjustmentForMaintainVisibleContentPosition = enableImmediateUpdateModeForContentOffsetChanges;
+
   auto contentOffset = RCTPointFromCGPoint(_scrollView.contentOffset);
+  BOOL isAccessibilityAPIUsed = _isAccessibilityAPIUsed;
   _state->updateState(
-      [contentOffset](
+      [contentOffset, isAccessibilityAPIUsed](
           const ScrollViewShadowNode::ConcreteState::Data &oldData) -> ScrollViewShadowNode::ConcreteState::SharedData {
-        if (oldData.contentOffset == contentOffset) {
-          // avoid doing a state update if content offset didn't change.
+        if (oldData.contentOffset == contentOffset && oldData.disableViewCulling == isAccessibilityAPIUsed) {
+          // avoid doing a state update if content offset and use of accessibility didn't change.
           return nullptr;
         }
         auto newData = oldData;
         newData.contentOffset = contentOffset;
+        newData.disableViewCulling =
+            UIAccessibilityIsVoiceOverRunning() || UIAccessibilityIsSwitchControlRunning() || isAccessibilityAPIUsed;
         return std::make_shared<const ScrollViewShadowNode::ConcreteState::Data>(newData);
-      });
+      },
+      enableImmediateUpdateModeForContentOffsetChanges ? EventQueue::UpdateMode::unstable_Immediate
+                                                       : EventQueue::UpdateMode::Asynchronous);
+
+  _avoidAdjustmentForMaintainVisibleContentPosition = NO;
 }
 
 - (void)prepareForRecycle
@@ -654,6 +712,8 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
   _contentView = nil;
   _prevFirstVisibleFrame = CGRectZero;
   _firstVisibleView = nil;
+  _firstVisibleViewTag = 0;
+  _virtualViewContainerState = nil;
 }
 
 #pragma mark - UIScrollViewDelegate
@@ -923,6 +983,10 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
 
 - (void)_remountChildrenIfNeeded
 {
+  if (ReactNativeFeatureFlags::enableViewCulling()) {
+    return;
+  }
+
   CGPoint contentOffset = _scrollView.contentOffset;
 
   if (std::abs(_contentOffsetWhenClipped.x - contentOffset.x) < kClippingLeeway &&
@@ -937,6 +1001,10 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
 
 - (void)_remountChildren
 {
+  if (ReactNativeFeatureFlags::enableViewCulling()) {
+    return;
+  }
+
   [_scrollView updateClippedSubviewsWithClipRect:CGRectInset(_scrollView.bounds, -kClippingLeeway, -kClippingLeeway)
                                   relativeToView:_scrollView];
 }
@@ -995,7 +1063,7 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
 - (void)_prepareForMaintainVisibleScrollPosition
 {
   const auto &props = static_cast<const ScrollViewProps &>(*_props);
-  if (!props.maintainVisibleContentPosition) {
+  if (!props.maintainVisibleContentPosition || _avoidAdjustmentForMaintainVisibleContentPosition) {
     return;
   }
 
@@ -1013,6 +1081,7 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
     if (hasNewView || ii == _contentView.subviews.count - 1) {
       _prevFirstVisibleFrame = subview.frame;
       _firstVisibleView = subview;
+      _firstVisibleViewTag = subview.tag;
       break;
     }
   }
@@ -1021,10 +1090,17 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
 - (void)_adjustForMaintainVisibleContentPosition
 {
   const auto &props = static_cast<const ScrollViewProps &>(*_props);
-  if (!props.maintainVisibleContentPosition) {
+  if (!props.maintainVisibleContentPosition || _avoidAdjustmentForMaintainVisibleContentPosition) {
     return;
   }
 
+  if (ReactNativeFeatureFlags::enableViewCulling()) {
+    // Abort if the first visible view has changed (different tag)
+    if (_firstVisibleView && _firstVisibleView.tag != _firstVisibleViewTag) {
+      return;
+    }
+  }
+
   std::optional<int> autoscrollThreshold = props.maintainVisibleContentPosition.value().autoscrollToTopThreshold;
   BOOL horizontal = _scrollView.contentSize.width > self.frame.size.width;
   // TODO: detect and handle/ignore re-ordering
@@ -1349,6 +1425,16 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
 }
 #endif // TARGET_OS_TV
 
+#pragma mark - RCTVirtualViewContainerProtocol
+
+- (RCTVirtualViewContainerState *)virtualViewContainerState
+{
+  if (!_virtualViewContainerState) {
+    _virtualViewContainerState = [[RCTVirtualViewContainerState alloc] initWithScrollView:self];
+  }
+  return _virtualViewContainerState;
+}
+
 @end
 
 Class<RCTComponentViewProtocol> RCTScrollViewCls(void)

package/React/Fabric/Mounting/ComponentViews/ScrollView/RCTVirtualViewContainerProtocol.h

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+@class RCTVirtualViewContainerState;
+
+@protocol RCTVirtualViewContainerProtocol
+
+- (RCTVirtualViewContainerState *)virtualViewContainerState;
+
+@end

package/React/Fabric/Mounting/ComponentViews/ScrollView/RCTVirtualViewContainerState.h

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <Foundation/Foundation.h>
+
+#import "RCTVirtualViewProtocol.h"
+
+@class RCTScrollViewComponentView;
+
+NS_ASSUME_NONNULL_BEGIN
+@interface RCTVirtualViewContainerState : NSObject
+
+- (instancetype)init NS_UNAVAILABLE;
+- (instancetype)new NS_UNAVAILABLE;
+- (instancetype)initWithScrollView:(RCTScrollViewComponentView *)scrollView NS_DESIGNATED_INITIALIZER;
+
+- (void)onChange:(id<RCTVirtualViewProtocol>)virtualView;
+- (void)remove:(id<RCTVirtualViewProtocol>)virtualView;
+@end
+
+NS_ASSUME_NONNULL_END

package/React/Fabric/Mounting/ComponentViews/ScrollView/RCTVirtualViewContainerState.mm

@@ -0,0 +1,190 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <React/RCTLog.h>
+#import <React/RCTScrollViewComponentView.h>
+#import <React/RCTVirtualViewMode.h>
+#import <UIKit/UIKit.h>
+#import <react/featureflags/ReactNativeFeatureFlags.h>
+
+#import "RCTVirtualViewContainerState.h"
+
+using namespace facebook;
+using namespace facebook::react;
+
+#if RCT_DEBUG
+static void debugLog(NSString *msg, ...)
+{
+  auto debugEnabled = ReactNativeFeatureFlags::enableVirtualViewDebugFeatures();
+  if (!debugEnabled) {
+    return;
+  }
+
+  va_list args;
+  va_start(args, msg);
+  NSString *msgString = [[NSString alloc] initWithFormat:msg arguments:args];
+  RCTLogInfo(@"%@", msgString);
+  va_end(args); // Don't forget to call va_end to clean up
+}
+
+#endif
+
+/**
+ * Checks whether one CGRect overlaps with another CGRect.
+ *
+ * This is different from CGRectIntersectsRect because a CGRect representing
+ * a line or a point is considered to overlap with another CGRect if the line
+ * or point is within the rect bounds. However, two CGRects are not considered
+ * to overlap if they only share a boundary.
+ */
+static BOOL CGRectOverlaps(CGRect rect1, CGRect rect2)
+{
+  CGFloat minY1 = CGRectGetMinY(rect1);
+  CGFloat maxY1 = CGRectGetMaxY(rect1);
+  CGFloat minY2 = CGRectGetMinY(rect2);
+  CGFloat maxY2 = CGRectGetMaxY(rect2);
+  if (minY1 >= maxY2 || minY2 >= maxY1) {
+    // No overlap on the y-axis.
+    return NO;
+  }
+  CGFloat minX1 = CGRectGetMinX(rect1);
+  CGFloat maxX1 = CGRectGetMaxX(rect1);
+  CGFloat minX2 = CGRectGetMinX(rect2);
+  CGFloat maxX2 = CGRectGetMaxX(rect2);
+  if (minX1 >= maxX2 || minX2 >= maxX1) {
+    // No overlap on the x-axis.
+    return NO;
+  }
+  return YES;
+}
+
+@interface RCTVirtualViewContainerState () <UIScrollViewDelegate>
+@end
+
+@interface RCTVirtualViewContainerState () {
+  NSMutableSet<id<RCTVirtualViewProtocol>> *_virtualViews;
+  CGRect _emptyRect;
+  CGRect _prerenderRect;
+  __weak RCTScrollViewComponentView *_scrollViewComponentView;
+  CGFloat _prerenderRatio;
+}
+@end
+
+@implementation RCTVirtualViewContainerState
+
+- (instancetype)initWithScrollView:(RCTScrollViewComponentView *)scrollView
+{
+  self = [super init];
+  if (self != nil) {
+    _virtualViews = [NSMutableSet set];
+    _emptyRect = CGRectZero;
+    _prerenderRect = CGRectZero;
+    _scrollViewComponentView = scrollView;
+    _prerenderRatio = ReactNativeFeatureFlags::virtualViewPrerenderRatio();
+    [_scrollViewComponentView addScrollListener:self];
+
+#if RCT_DEBUG
+    debugLog(@"initWithScrollView");
+#endif
+  }
+  return self;
+}
+
+- (void)dealloc
+{
+#if RCT_DEBUG
+  debugLog(@"dealloc");
+#endif
+  if (_scrollViewComponentView != nil) {
+    [_scrollViewComponentView removeScrollListener:self];
+    _scrollViewComponentView = nil;
+  }
+  [_virtualViews removeAllObjects];
+}
+
+#pragma mark - Public API
+
+- (void)onChange:(id<RCTVirtualViewProtocol>)virtualView
+{
+  if (![_virtualViews containsObject:virtualView]) {
+    [_virtualViews addObject:virtualView];
+#if RCT_DEBUG
+    debugLog(@"Add virtualViewID=%@", virtualView.virtualViewID);
+#endif
+
+  } else {
+#if RCT_DEBUG
+    debugLog(@"Update virtualViewID=%@", virtualView.virtualViewID);
+#endif
+  }
+  [self _updateModes:virtualView];
+}
+
+- (void)remove:(id<RCTVirtualViewProtocol>)virtualView
+{
+  if (![_virtualViews containsObject:virtualView]) {
+    RCTLogError(@"Attempting to remove non-existent VirtualView: %@", virtualView.virtualViewID);
+  }
+
+  [_virtualViews removeObject:virtualView];
+
+#if RCT_DEBUG
+  debugLog(@"Remove virtualViewID=%@", virtualView.virtualViewID);
+#endif
+}
+
+#pragma mark - Private Helpers
+
+- (void)_updateModes:(id<RCTVirtualViewProtocol>)virtualView
+{
+  auto scrollView = _scrollViewComponentView.scrollView;
+  CGRect visibleRect = CGRectMake(
+      scrollView.contentOffset.x,
+      scrollView.contentOffset.y,
+      scrollView.frame.size.width,
+      scrollView.frame.size.height);
+
+  _prerenderRect = visibleRect;
+  _prerenderRect = CGRectInset(
+      _prerenderRect, -_prerenderRect.size.width * _prerenderRatio, -_prerenderRect.size.height * _prerenderRatio);
+
+  NSArray<id<RCTVirtualViewProtocol>> *virtualViewsIt =
+      (virtualView != nullptr) ? @[ virtualView ] : [_virtualViews allObjects];
+
+  for (id<RCTVirtualViewProtocol> vv = nullptr in virtualViewsIt) {
+    CGRect rect = [vv containerRelativeRect:scrollView];
+
+    RCTVirtualViewMode mode = RCTVirtualViewModeHidden;
+    CGRect thresholdRect = _emptyRect;
+
+    if (CGRectOverlaps(rect, visibleRect)) {
+      thresholdRect = visibleRect;
+      mode = RCTVirtualViewModeVisible;
+    } else if (CGRectOverlaps(rect, _prerenderRect)) {
+      mode = RCTVirtualViewModePrerender;
+      thresholdRect = _prerenderRect;
+    }
+
+#if RCT_DEBUG
+    debugLog(
+        @"UpdateModes virtualView=%@ mode=%ld rect=%@ thresholdRect=%@",
+        vv.virtualViewID,
+        (long)mode,
+        NSStringFromCGRect(rect),
+        NSStringFromCGRect(thresholdRect));
+#endif
+    [vv onModeChange:mode targetRect:rect thresholdRect:thresholdRect];
+  }
+}
+
+#pragma mark - UIScrollViewDelegate
+
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView
+{
+  [self _updateModes:nil];
+}
+@end

package/React/Fabric/Mounting/ComponentViews/ScrollView/RCTVirtualViewProtocol.h

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <React/RCTVirtualViewMode.h>
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol RCTVirtualViewProtocol <NSObject>
+
+- (NSString *)virtualViewID;
+- (CGRect)containerRelativeRect:(UIView *)view;
+- (void)onModeChange:(RCTVirtualViewMode)newMode targetRect:(CGRect)targetRect thresholdRect:(CGRect)thresholdRect;
+@end
+
+NS_ASSUME_NONNULL_END

package/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm

@@ -9,7 +9,6 @@
 #import "RCTParagraphComponentAccessibilityProvider.h"
 
 #import <MobileCoreServices/UTCoreTypes.h>
-#import <React/RCTViewAccessibilityElement.h>
 #import <react/renderer/components/text/ParagraphComponentDescriptor.h>
 #import <react/renderer/components/text/ParagraphProps.h>
 #import <react/renderer/components/text/ParagraphState.h>
@@ -229,10 +228,6 @@ using namespace facebook::react;
         for (NSObject *element in elements) {
           if ([element isKindOfClass:[UIView class]] && [cooptingCandidates containsObject:((UIView *)element)]) {
             return YES;
-          } else if (
-              [element isKindOfClass:[RCTViewAccessibilityElement class]] &&
-              [cooptingCandidates containsObject:((RCTViewAccessibilityElement *)element).view]) {
-            return YES;
           }
         }
       }

package/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm

@@ -387,6 +387,9 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
   _lastStringStateWasUpdatedWith = nil;
   _ignoreNextTextInputCall = NO;
   _didMoveToWindow = NO;
+  _backedTextInputView.inputAccessoryViewID = nil;
+  _backedTextInputView.inputAccessoryView = nil;
+  _hasInputAccessoryView = false;
   [_backedTextInputView resignFirstResponder];
 }
 
@@ -746,7 +749,7 @@ static NSSet<NSNumber *> *returnKeyTypesSet;
                                                   toPosition:selectedTextRange.start];
   NSInteger end = [_backedTextInputView offsetFromPosition:_backedTextInputView.beginningOfDocument
                                                 toPosition:selectedTextRange.end];
-  return AttributedString::Range{(int)start, (int)(end - start)};
+  return AttributedString::Range{.location = (int)start, .length = (int)(end - start)};
 }
 
 - (void)_restoreTextSelection

package/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm

@@ -6,7 +6,6 @@
  */
 
 #import "RCTViewComponentView.h"
-#import "RCTViewAccessibilityElement.h"
 
 #import <CoreGraphics/CoreGraphics.h>
 #import <QuartzCore/QuartzCore.h>
@@ -72,8 +71,6 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
   UIView *_containerView;
   BOOL _useCustomContainerView;
   NSMutableSet<NSString *> *_accessibilityOrderNativeIDs;
-  NSMutableArray<NSObject *> *_accessibilityElements;
-  RCTViewAccessibilityElement *_axElementDescribingSelf;
   ParallaxProperties _tvParallaxProperties;
   BOOL _hasTVPreferredFocus;
   UIView *_nextFocusUp;
@@ -945,7 +942,11 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
       [_accessibilityOrderNativeIDs addObject:RCTNSStringFromString(childId)];
     }
 
-    _accessibilityElements = [NSMutableArray new];
+    // If we are prop updating and have children we can go ahead and assign this prop.
+    // Otherwise, we might not have children attached yet and need to wait before then.
+    if (self.currentContainerView.subviews.count > 0) {
+      [self updateAccessibilityElements];
+    }
   }
 
   // `accessibilityTraits`
@@ -1209,7 +1210,7 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
     _backgroundColorLayer.frame = CGRectMake(0, 0, self.layer.bounds.size.width, self.layer.bounds.size.height);
   }
 
-  if ((_props->transformOrigin.isSet() || _props->transform.operations.size() > 0) &&
+  if ((_props->transformOrigin.isSet() || !_props->transform.operations.empty()) &&
       layoutMetrics.frame.size != oldLayoutMetrics.frame.size) {
     auto newTransform = _props->resolveTransform(layoutMetrics);
     self.layer.transform = RCTCATransform3DFromTransformMatrix(newTransform);
@@ -1271,7 +1272,6 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
   _isJSResponder = NO;
   _removeClippedSubviews = NO;
   _reactSubviews = [NSMutableArray new];
-  _accessibilityElements = [NSMutableArray new];
 }
 
 - (void)setPropKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN:(NSSet<NSString *> *_Nullable)props
@@ -1803,43 +1803,37 @@ static RCTBorderStyle RCTBorderStyleFromOutlineStyle(OutlineStyle outlineStyle)
   return self;
 }
 
-- (NSArray<NSObject *> *)accessibilityElements
+- (void)didMoveToSuperview
 {
-  if ([_accessibilityOrderNativeIDs count] <= 0) {
-    return super.accessibilityElements;
+  // At this point we are guaranteed to have subviews, if we are going to have them
+  if (ReactNativeFeatureFlags::enableAccessibilityOrder()) {
+    [self updateAccessibilityElements];
   }
+}
 
-  // TODO: Currently this ignores changes to descendant nativeID's. While that should rarely, if ever happen, it's an
-  // edge case we should address. Currently this fixes some app deaths so landing this without addressing that edge case
-  // for now.
-  if ([_accessibilityElements count] > 0) {
-    return _accessibilityElements;
+- (void)updateAccessibilityElements
+{
+  if ([_accessibilityOrderNativeIDs count] == 0) {
+    self.accessibilityElements = nil;
+    return;
   }
 
   NSMutableDictionary<NSString *, UIView *> *nativeIdToView = [NSMutableDictionary new];
-
   [RCTViewComponentView collectAccessibilityElements:self
                                       intoDictionary:nativeIdToView
                                            nativeIds:_accessibilityOrderNativeIDs];
 
-  for (auto childId : _props->accessibilityOrder) {
+  NSMutableArray *accessibilityElements = [NSMutableArray new];
+  for (const auto &childId : _props->accessibilityOrder) {
     NSString *nsStringChildId = RCTNSStringFromString(childId);
-    // Special case to allow for self-referencing with accessibilityOrder
-    if ([nsStringChildId isEqualToString:self.nativeId]) {
-      if (!_axElementDescribingSelf) {
-        _axElementDescribingSelf = [[RCTViewAccessibilityElement alloc] initWithView:self];
-      }
-      _axElementDescribingSelf.isAccessibilityElement = [super isAccessibilityElement];
-      [_accessibilityElements addObject:_axElementDescribingSelf];
-    } else {
-      UIView *viewWithMatchingNativeId = [nativeIdToView objectForKey:nsStringChildId];
-      if (viewWithMatchingNativeId) {
-        [_accessibilityElements addObject:viewWithMatchingNativeId];
-      }
+
+    UIView *viewWithMatchingNativeId = [nativeIdToView objectForKey:nsStringChildId];
+    if (viewWithMatchingNativeId != nil) {
+      [accessibilityElements addObject:viewWithMatchingNativeId];
     }
   }
 
-  return _accessibilityElements;
+  self.accessibilityElements = accessibilityElements;
 }
 
 + (void)collectAccessibilityElements:(UIView *)view
@@ -1906,13 +1900,6 @@ static NSString *RCTRecursiveAccessibilityLabel(UIView *view)
     return self.contentView.isAccessibilityElement;
   }
 
-  // If we reference ourselves in accessibilityOrder then we will make a
-  // UIAccessibilityElement object to represent ourselves since returning YES
-  // here would mean iOS would not call into accessibilityElements
-  if ([_accessibilityOrderNativeIDs containsObject:self.nativeId]) {
-    return NO;
-  }
-
   return [super isAccessibilityElement];
 }