Reverted ca9d1b3bf5a6f46ec29babe8685634690ff9a2bc to unbreak groups

Author: sahrens

Examples/UIExplorer/UIExplorerIntegrationTests/RCTUIManagerScenarioTests.m

@@ -14,22 +14,21 @@
 
 #import <XCTest/XCTest.h>
 
-#import "RCTRootView.h"
-#import "RCTShadowView.h"
 #import "RCTSparseArray.h"
 #import "RCTUIManager.h"
 #import "UIView+React.h"
 
 @interface RCTUIManager (Testing)
 
 - (void)_manageChildren:(NSNumber *)containerReactTag
+        moveFromIndices:(NSArray *)moveFromIndices
+          moveToIndices:(NSArray *)moveToIndices
       addChildReactTags:(NSArray *)addChildReactTags
            addAtIndices:(NSArray *)addAtIndices
         removeAtIndices:(NSArray *)removeAtIndices
                registry:(RCTSparseArray *)registry;
 
 @property (nonatomic, readonly) RCTSparseArray *viewRegistry;
-@property (nonatomic, readonly) RCTSparseArray *shadowViewRegistry; // RCT thread only
 
 @end
 
@@ -52,11 +51,6 @@ - (void)setUp
     UIView *registeredView = [[UIView alloc] init];
     [registeredView setReactTag:@(i)];
     _uiManager.viewRegistry[i] = registeredView;
-
-    RCTShadowView *registeredShadowView = [[RCTShadowView alloc] init];
-    registeredShadowView.viewName = @"RCTView";
-    [registeredShadowView setReactTag:@(i)];
-    _uiManager.shadowViewRegistry[i] = registeredShadowView;
   }
 }
 
@@ -73,6 +67,8 @@ - (void)testManagingChildrenToAddViews
 
   // Add views 1-5 to view 20
   [_uiManager _manageChildren:@20
+              moveFromIndices:nil
+                moveToIndices:nil
             addChildReactTags:tagsToAdd
                  addAtIndices:addAtIndices
               removeAtIndices:nil
@@ -105,6 +101,8 @@ - (void)testManagingChildrenToRemoveViews
 
   // Remove views 1-5 from view 20
   [_uiManager _manageChildren:@20
+              moveFromIndices:nil
+                moveToIndices:nil
             addChildReactTags:nil
                  addAtIndices:nil
               removeAtIndices:removeAtIndices
@@ -142,9 +140,11 @@ - (void)testManagingChildrenToAddRemoveAndMove
 {
   UIView *containerView = _uiManager.viewRegistry[20];
 
-  NSArray *removeAtIndices = @[@2, @3, @5, @8, @4, @9];
-  NSArray *addAtIndices = @[@0, @6, @1, @7];
-  NSArray *tagsToAdd = @[@11, @12, @5, @10];
+  NSArray *removeAtIndices = @[@2, @3, @5, @8];
+  NSArray *addAtIndices = @[@0, @6];
+  NSArray *tagsToAdd = @[@11, @12];
+  NSArray *moveFromIndices = @[@4, @9];
+  NSArray *moveToIndices = @[@1, @7];
 
   // We need to keep these in array to keep them around
   NSMutableArray *viewsToRemove = [NSMutableArray array];
@@ -160,6 +160,8 @@ - (void)testManagingChildrenToAddRemoveAndMove
   }
 
   [_uiManager _manageChildren:@20
+              moveFromIndices:moveFromIndices
+                moveToIndices:moveToIndices
             addChildReactTags:tagsToAdd
                  addAtIndices:addAtIndices
               removeAtIndices:removeAtIndices

Examples/UIExplorer/UIExplorerIntegrationTests/ReferenceImages/Examples-UIExplorer-UIExplorerApp.ios/[email protected]

@@ -279,7 +279,6 @@ var ScrollView = React.createClass({
 
     var contentContainer =
       <View
-        collapsible={false}
         ref={INNERVIEW}
         style={contentContainerStyle}
         removeClippedSubviews={this.props.removeClippedSubviews}>

Examples/UIExplorer/UIExplorerUnitTests/RCTUIManagerTests.m

@@ -83,12 +83,6 @@ var View = React.createClass({
   },
 
   propTypes: {
-    /**
-     * When false, indicates that the view should not be collapsed, even if it is
-     * layout-only. Defaults to true.
-     */
-    collapsible: PropTypes.bool,
-
     /**
      * When true, indicates that the view is an accessibility element. By default,
      * all the touchable elements are accessible.

Libraries/Components/ScrollView/ScrollView.js

@@ -24,22 +24,6 @@ ReactNativeViewAttributes.UIView = {
   onLayout: true,
   onAccessibilityTap: true,
   onMagicTap: true,
-  collapsible: true,
-
-  // If editing layout-only view attributes, make sure
-  // -[RCTShadowView isLayoutOnly] in RCTShadowView.m
-  // is up-to-date! If any property below is set, the
-  // view should not be collapsible, but this is done
-  // on the native side.
-  onMoveShouldSetResponder: true,
-  onResponderGrant: true,
-  onResponderMove: true,
-  onResponderReject: true,
-  onResponderRelease: true,
-  onResponderTerminate: true,
-  onResponderTerminationRequest: true,
-  onStartShouldSetResponder: true,
-  onStartShouldSetResponderCapture: true,
 };
 
 ReactNativeViewAttributes.RCTView = merge(

Libraries/Components/View/View.js

@@ -20,11 +20,6 @@ - (void)setText:(NSString *)text
   }
 }
 
-- (BOOL)isLayoutOnly
-{
-  return YES;
-}
-
 - (NSString *)description
 {
   NSString *superDescription = super.description;