From c42183817dbac1fad9ded547cbcf0b91dfc08070 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Wed, 30 Sep 2020 19:21:57 -0700
Subject: [PATCH] Fixed incorrect assert in RCTScrollViewComponentView

Summary:
This diff removes an incorrect assert and replaces it with a debug-only verification phase that compares "what we want" with "what we get".

Changelog: [Internal] Fabric-specific internal change.

Reviewed By: PeteTheHeat

Differential Revision: D23983123

fbshipit-source-id: 03a628b4f8baa1f5fe4b55354b7c943e38b5e537
---
 .../ScrollView/RCTScrollViewComponentView.mm  | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
index 859b4582980..848e26d2678 100644
--- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
@@ -498,16 +498,15 @@ static void RCTSendPaperScrollEvent_DEPRECATED(UIScrollView *scrollView, NSInteg
   visibleFrame.size.width *= scale;
   visibleFrame.size.height *= scale;
 
+#ifndef NDEBUG
+  NSMutableArray<UIView<RCTComponentViewProtocol> *> *expectedSubviews = [NSMutableArray new];
+#endif
+
   NSInteger mountedIndex = 0;
   for (UIView *componentView in _childComponentViews) {
     BOOL shouldBeMounted = YES;
     BOOL isMounted = componentView.superview != nil;
 
-    // If a view is mounted, it must be mounted exactly at `mountedIndex` position.
-    RCTAssert(
-        !isMounted || [_containerView.subviews objectAtIndex:mountedIndex] == componentView,
-        @"Attempt to unmount improperly mounted component view.");
-
     // It's simpler and faster to not mess with views that are not `RCTViewComponentView` subclasses.
     if ([componentView isKindOfClass:[RCTViewComponentView class]]) {
       RCTViewComponentView *viewComponentView = (RCTViewComponentView *)componentView;
@@ -529,7 +528,24 @@ static void RCTSendPaperScrollEvent_DEPRECATED(UIScrollView *scrollView, NSInteg
     if (shouldBeMounted) {
       mountedIndex++;
     }
+
+#ifndef NDEBUG
+    if (shouldBeMounted) {
+      [expectedSubviews addObject:componentView];
+    }
+#endif
   }
+
+#ifndef NDEBUG
+  RCTAssert(
+      _containerView.subviews.count == expectedSubviews.count,
+      @"-[RCTScrollViewComponentView _remountChildren]: Inconsistency detected.");
+  for (NSInteger i = 0; i < expectedSubviews.count; i++) {
+    RCTAssert(
+        [_containerView.subviews objectAtIndex:i] == [expectedSubviews objectAtIndex:i],
+        @"-[RCTScrollViewComponentView _remountChildren]: Inconsistency detected.");
+  }
+#endif
 }
 
 #pragma mark - RCTScrollableProtocol