Move code around

React/Views/RCTShadowView.m

@@ -232,7 +232,6 @@ - (void)applyLayoutToChildren:(YGNodeRef)node
     [self didUpdateReactSubviews];
     [applierBlocks addObject:^(NSDictionary<NSNumber *, UIView *> *viewRegistry) {
       UIView *view = viewRegistry[self->_reactTag];
-      [view clearSortedSubviews];
       [view didUpdateReactSubviews];
     }];
   }

React/Views/RCTView.m

@@ -171,23 +171,7 @@ - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
   BOOL needsHitSubview = !(_pointerEvents == RCTPointerEventsNone || _pointerEvents == RCTPointerEventsBoxOnly);
   if (needsHitSubview && (![self clipsToBounds] || isPointInside)) {
     // Take z-index into account when calculating the touch target.
-    // Check if sorting is required - in most cases it won't be.
-    BOOL sortingRequired = NO;
-    for (UIView *subview in self.subviews) {
-      if (subview.layer.zPosition != 0) {
-        sortingRequired = YES;
-        break;
-      }
-    }
-    NSArray<UIView *> *sortedSubviews = sortingRequired ? [self.reactSubviews sortedArrayUsingComparator:^NSComparisonResult(UIView *a, UIView *b) {
-      if (a.layer.zPosition > b.layer.zPosition) {
-        return NSOrderedDescending;
-      } else {
-        // Ensure sorting is stable by treating equal zIndex as ascending so
-        // that original order is preserved.
-        return NSOrderedAscending;
-      }
-    }] : self.subviews;
+    NSArray<UIView *> *sortedSubviews = [self reactZIndexSortedSubviews];
 
     // The default behaviour of UIKit is that if a view does not contain a point,
     // then no subviews will be returned from hit testing, even if they contain

React/Views/RCTViewManager.m

@@ -255,15 +255,7 @@ - (RCTViewManagerUIBlock)uiBlockToAmendWithShadowViewRegistry:(__unused NSDictio
 RCT_VIEW_BORDER_RADIUS_PROPERTY(BottomLeft)
 RCT_VIEW_BORDER_RADIUS_PROPERTY(BottomRight)
 
-RCT_CUSTOM_VIEW_PROPERTY(zIndex, NSInteger, RCTView)
-{
-  if (json) {
-    NSInteger index = [RCTConvert NSInteger:json];
-    view.layer.zPosition = index;
-  } else {
-    view.layer.zPosition = 0;
-  }
-}
+RCT_REMAP_VIEW_PROPERTY(zIndex, reactZIndex, NSInteger)
 
 #pragma mark - ShadowView properties
 

React/Views/UIView+Private.h

@@ -16,7 +16,4 @@
 - (void)react_updateClippedSubviewsWithClipRect:(CGRect)clipRect relativeToView:(UIView *)clipView;
 - (UIView *)react_findClipView;
 
-// zIndex sorting
-- (void)clearSortedSubviews;
-
 @end

React/Views/UIView+React.h

@@ -30,6 +30,10 @@
  */
 @property (nonatomic, assign) UIUserInterfaceLayoutDirection reactLayoutDirection;
 
+@property (nonatomic, assign) NSInteger reactZIndex;
+
+- (NSArray<UIView *> *)reactZIndexSortedSubviews;
+
 /**
  * Updates the subviews array based on the reactSubviews. Default behavior is
  * to insert the sortedReactSubviews into the UIView.

React/Views/UIView+React.m

@@ -108,6 +108,37 @@ - (void)setReactLayoutDirection:(UIUserInterfaceLayoutDirection)layoutDirection
   }
 }
 
+- (NSInteger)reactZIndex
+{
+  return self.layer.zPosition;
+}
+
+- (void)setReactZIndex:(NSInteger)reactZIndex
+{
+  self.layer.zPosition = reactZIndex;
+}
+
+- (NSArray<UIView *> *)reactZIndexSortedSubviews
+{
+  // Check if sorting is required - in most cases it won't be.
+  BOOL sortingRequired = NO;
+  for (UIView *subview in self.subviews) {
+    if (subview.reactZIndex != 0) {
+      sortingRequired = YES;
+      break;
+    }
+  }
+  return sortingRequired ? [self.reactSubviews sortedArrayUsingComparator:^NSComparisonResult(UIView *a, UIView *b) {
+    if (a.reactZIndex > b.reactZIndex) {
+      return NSOrderedDescending;
+    } else {
+      // Ensure sorting is stable by treating equal zIndex as ascending so
+      // that original order is preserved.
+      return NSOrderedAscending;
+    }
+  }] : self.subviews;
+}
+
 - (void)didUpdateReactSubviews
 {
   for (UIView *subview in self.reactSubviews) {