core: Remove legacy components (#52118)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/52118

This diff aims to remove all legacy components from react native core.

Reviewed By: mdvacca

Differential Revision: D72733503

fbshipit-source-id: 3ed28c252c79b5a1ead794d758d1cf5bc265f265

packages/react-native/Libraries/Image/RCTImageShadowView.h

@@ -7,6 +7,10 @@
 
 #import <React/RCTShadowView.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 @interface RCTImageShadowView : RCTShadowView
 
 @end
+
+#endif

packages/react-native/Libraries/Image/RCTImageShadowView.mm

@@ -9,6 +9,8 @@
 
 #import <React/RCTLog.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 @implementation RCTImageShadowView
 
 - (BOOL)isYogaLeafNode
@@ -22,3 +24,5 @@
 }
 
 @end
+
+#endif

packages/react-native/Libraries/Image/RCTImageView.h

@@ -9,6 +9,8 @@
 #import <React/RCTView.h>
 #import <UIKit/UIKit.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 @class RCTBridge;
 @class RCTImageSource;
 
@@ -25,3 +27,5 @@
 @property (nonatomic, copy) NSString *internal_analyticTag;
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Image/RCTImageView.mm

@@ -17,6 +17,8 @@
 #import <React/RCTUtils.h>
 #import <React/UIView+React.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 /**
  * Determines whether an image of `currentSize` should be reloaded for display
  * at `idealSize`.
@@ -502,3 +504,5 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame)
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Image/RCTImageViewManager.h

@@ -7,6 +7,10 @@
 
 #import <React/RCTViewManager.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 @interface RCTImageViewManager : RCTViewManager
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Image/RCTImageViewManager.mm

@@ -7,6 +7,8 @@
 
 #import <React/RCTImageViewManager.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <UIKit/UIKit.h>
 
 #import <React/RCTConvert.h>
@@ -114,3 +116,5 @@ RCT_EXPORT_METHOD(queryCache
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/BaseText/RCTBaseTextShadowView.h

@@ -7,6 +7,8 @@
 
 #import <React/RCTShadowView.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import "RCTTextAttributes.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -27,3 +29,5 @@ extern NSString *const RCTBaseTextShadowViewEmbeddedShadowViewAttributeName;
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/BaseText/RCTBaseTextShadowView.mm

@@ -7,6 +7,8 @@
 
 #import <React/RCTBaseTextShadowView.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTShadowView+Layout.h>
 
 #import <React/RCTRawTextShadowView.h>
@@ -156,3 +158,5 @@ static void RCTInlineViewYogaNodeDirtied(YGNodeConstRef node)
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/BaseText/RCTBaseTextViewManager.h

@@ -7,6 +7,8 @@
 
 #import <React/RCTViewManager.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface RCTBaseTextViewManager : RCTViewManager
@@ -14,3 +16,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/BaseText/RCTBaseTextViewManager.mm

@@ -7,6 +7,8 @@
 
 #import <React/RCTBaseTextViewManager.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 @implementation RCTBaseTextViewManager
 
 RCT_EXPORT_MODULE(RCTBaseText)
@@ -58,3 +60,5 @@ RCT_REMAP_SHADOW_PROPERTY(isHighlighted, textAttributes.isHighlighted, BOOL)
 RCT_REMAP_SHADOW_PROPERTY(textTransform, textAttributes.textTransform, RCTTextTransform)
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/RCTTextAttributes.h

@@ -11,6 +11,8 @@
 #import <React/RCTTextDecorationLineType.h>
 #import <React/RCTTextTransform.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 NS_ASSUME_NONNULL_BEGIN
 
 extern NSString *const RCTTextAttributesIsHighlightedAttributeName;
@@ -98,3 +100,5 @@ extern NSString *const RCTTextAttributesTagAttributeName;
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/RCTTextAttributes.mm

@@ -7,6 +7,8 @@
 
 #import <React/RCTTextAttributes.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTAssert.h>
 #import <React/RCTFont.h>
 #import <React/RCTLog.h>
@@ -352,3 +354,5 @@ static NSString *capitalizeText(NSString *text)
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/RawText/RCTRawTextShadowView.h

@@ -7,6 +7,8 @@
 
 #import <React/RCTShadowView.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface RCTRawTextShadowView : RCTShadowView
@@ -16,3 +18,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/RawText/RCTRawTextShadowView.mm

@@ -7,6 +7,8 @@
 
 #import <React/RCTRawTextShadowView.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTShadowView+Layout.h>
 
 @implementation RCTRawTextShadowView
@@ -32,3 +34,5 @@
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/RawText/RCTRawTextViewManager.h

@@ -7,6 +7,8 @@
 
 #import <React/RCTViewManager.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface RCTRawTextViewManager : RCTViewManager
@@ -14,3 +16,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/RawText/RCTRawTextViewManager.mm

@@ -7,6 +7,8 @@
 
 #import <React/RCTRawTextViewManager.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTRawTextShadowView.h>
 
 @implementation RCTRawTextViewManager
@@ -26,3 +28,5 @@ RCT_EXPORT_MODULE(RCTRawText)
 RCT_EXPORT_SHADOW_PROPERTY(text, NSString)
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/Text/RCTTextShadowView.h

@@ -7,6 +7,8 @@
 
 #import <React/RCTShadowView.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import "RCTBaseTextShadowView.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -26,3 +28,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/Text/RCTTextShadowView.mm

@@ -7,6 +7,8 @@
 
 #import <React/RCTTextShadowView.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTBridge.h>
 #import <React/RCTShadowView+Layout.h>
 #import <React/RCTUIManager.h>
@@ -464,3 +466,5 @@ static float RCTTextShadowViewBaseline(YGNodeConstRef node, const float width, c
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/Text/RCTTextView.h

@@ -7,6 +7,8 @@
 
 #import <React/RCTComponent.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -27,3 +29,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/Text/RCTTextView.mm

@@ -7,6 +7,8 @@
 
 #import <React/RCTTextView.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <MobileCoreServices/UTCoreTypes.h>
 
 #import <React/RCTUtils.h>
@@ -292,3 +294,5 @@
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/Text/RCTTextViewManager.h

@@ -7,8 +7,12 @@
 
 #import <React/RCTViewManager.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import "RCTBaseTextViewManager.h"
 
 @interface RCTTextViewManager : RCTBaseTextViewManager
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/Text/RCTTextViewManager.mm

@@ -7,6 +7,8 @@
 
 #import <React/RCTTextViewManager.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTShadowView+Layout.h>
 #import <React/RCTShadowView.h>
 #import <React/RCTUIManager.h>
@@ -91,3 +93,5 @@ RCT_EXPORT_VIEW_PROPERTY(selectable, BOOL)
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.h

@@ -7,6 +7,8 @@
 
 #import "RCTBaseTextInputView.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface RCTMultilineTextInputView : RCTBaseTextInputView
@@ -14,3 +16,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.mm

@@ -7,6 +7,8 @@
 
 #import <React/RCTMultilineTextInputView.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTUtils.h>
 
 #import <React/RCTUITextView.h>
@@ -61,3 +63,5 @@
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.h

@@ -7,6 +7,8 @@
 
 #import "RCTBaseTextInputViewManager.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface RCTMultilineTextInputViewManager : RCTBaseTextInputViewManager
@@ -14,3 +16,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.mm

@@ -8,6 +8,8 @@
 #import <React/RCTMultilineTextInputView.h>
 #import <React/RCTMultilineTextInputViewManager.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 @implementation RCTMultilineTextInputViewManager
 
 RCT_EXPORT_MODULE()
@@ -22,3 +24,5 @@ RCT_EXPORT_MODULE()
 RCT_REMAP_VIEW_PROPERTY(dataDetectorTypes, backedTextInputView.dataDetectorTypes, UIDataDetectorTypes)
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputShadowView.h

@@ -7,6 +7,8 @@
 
 #import "RCTBaseTextShadowView.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface RCTBaseTextInputShadowView : RCTBaseTextShadowView
@@ -23,3 +25,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputShadowView.mm

@@ -7,6 +7,8 @@
 
 #import <React/RCTBaseTextInputShadowView.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTBridge.h>
 #import <React/RCTShadowView+Layout.h>
 #import <React/RCTUIManager.h>
@@ -362,3 +364,5 @@ static float RCTTextInputShadowViewBaseline(YGNodeConstRef node, const float wid
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.h

@@ -7,6 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTView.h>
 
 #import "RCTBackedTextInputDelegate.h"
@@ -61,3 +63,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm

@@ -7,6 +7,8 @@
 
 #import <React/RCTBaseTextInputView.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTBridge.h>
 #import <React/RCTConvert.h>
 #import <React/RCTEventDispatcherProtocol.h>
@@ -840,3 +842,5 @@ static BOOL findMismatch(NSString *first, NSString *second, NSRange *firstRange,
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.h

@@ -7,6 +7,10 @@
 
 #import "RCTBaseTextViewManager.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 @interface RCTBaseTextInputViewManager : RCTBaseTextViewManager
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.mm

@@ -7,6 +7,8 @@
 
 #import <React/RCTBaseTextInputViewManager.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTBridge.h>
 #import <React/RCTConvert.h>
 #import <React/RCTFont.h>
@@ -178,3 +180,5 @@ RCT_EXPORT_METHOD(setTextAndSelection
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryShadowView.h

@@ -7,6 +7,10 @@
 
 #import <React/RCTShadowView.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 @interface RCTInputAccessoryShadowView : RCTShadowView
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryShadowView.mm

@@ -7,6 +7,8 @@
 
 #import <React/RCTInputAccessoryShadowView.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTUtils.h>
 
 @implementation RCTInputAccessoryShadowView
@@ -18,3 +20,5 @@
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryView.h

@@ -7,6 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 @class RCTBridge;
 @class RCTInputAccessoryViewContent;
 
@@ -15,3 +17,5 @@
 - (instancetype)initWithBridge:(RCTBridge *)bridge;
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryView.mm

@@ -7,6 +7,8 @@
 
 #import <React/RCTInputAccessoryView.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTBridge.h>
 #import <React/RCTTouchHandler.h>
 #import <React/UIView+React.h>
@@ -76,3 +78,5 @@
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewContent.h

@@ -7,6 +7,10 @@
 
 #import <UIKit/UIKit.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 @interface RCTInputAccessoryViewContent : UIView
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewContent.mm

@@ -7,6 +7,8 @@
 
 #import <React/RCTInputAccessoryViewContent.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/UIView+React.h>
 
 @implementation RCTInputAccessoryViewContent {
@@ -72,3 +74,5 @@
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewManager.h

@@ -7,6 +7,10 @@
 
 #import <React/RCTViewManager.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 @interface RCTInputAccessoryViewManager : RCTViewManager
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewManager.mm

@@ -7,6 +7,8 @@
 
 #import <React/RCTInputAccessoryViewManager.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTInputAccessoryShadowView.h>
 #import <React/RCTInputAccessoryView.h>
 
@@ -27,3 +29,5 @@ RCT_EXPORT_MODULE()
 RCT_REMAP_VIEW_PROPERTY(backgroundColor, inputAccessoryView.backgroundColor, UIColor)
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.h

@@ -7,6 +7,8 @@
 
 #import "RCTBaseTextInputView.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface RCTSinglelineTextInputView : RCTBaseTextInputView
@@ -14,3 +16,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.mm

@@ -7,6 +7,8 @@
 
 #import <React/RCTSinglelineTextInputView.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTBridge.h>
 
 #import <React/RCTUITextField.h>
@@ -37,3 +39,5 @@
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.h

@@ -7,6 +7,8 @@
 
 #import "RCTBaseTextInputViewManager.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface RCTSinglelineTextInputViewManager : RCTBaseTextInputViewManager
@@ -14,3 +16,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.mm

@@ -7,6 +7,8 @@
 
 #import <React/RCTSinglelineTextInputViewManager.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTBaseTextInputShadowView.h>
 #import <React/RCTSinglelineTextInputView.h>
 
@@ -29,3 +31,5 @@ RCT_EXPORT_MODULE()
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextShadowView.h

@@ -7,6 +7,10 @@
 
 #import "RCTBaseTextShadowView.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 @interface RCTVirtualTextShadowView : RCTBaseTextShadowView
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextShadowView.mm

@@ -7,6 +7,8 @@
 
 #import <React/RCTVirtualTextShadowView.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTShadowView+Layout.h>
 #import <yoga/Yoga.h>
 
@@ -36,3 +38,5 @@
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextView.h

@@ -7,6 +7,8 @@
 
 #import <React/RCTComponent.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -21,3 +23,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextView.mm

@@ -7,6 +7,10 @@
 
 #import <React/RCTVirtualTextView.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 @implementation RCTVirtualTextView
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextViewManager.h

@@ -7,6 +7,10 @@
 
 #import "RCTBaseTextViewManager.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 @interface RCTVirtualTextViewManager : RCTBaseTextViewManager
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextViewManager.mm

@@ -9,6 +9,8 @@
 #import <React/RCTVirtualTextView.h>
 #import <React/RCTVirtualTextViewManager.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 @implementation RCTVirtualTextViewManager
 
 RCT_EXPORT_MODULE(RCTVirtualText)
@@ -24,3 +26,5 @@ RCT_EXPORT_MODULE(RCTVirtualText)
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Wrapper/Example/RCTWrapperExampleView.h

@@ -7,6 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface RCTWrapperExampleView : UIView
@@ -14,3 +16,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Wrapper/Example/RCTWrapperExampleView.m

@@ -7,6 +7,8 @@
 
 #import "RCTWrapperExampleView.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <RCTWrapper/RCTWrapper.h>
 
 @implementation RCTWrapperExampleView {
@@ -51,3 +53,5 @@
 @end
 
 RCT_WRAPPER_FOR_VIEW(RCTWrapperExampleView)
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Wrapper/Example/RCTWrapperExampleViewController.h

@@ -7,6 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface RCTWrapperExampleViewController : UIViewController
@@ -14,3 +16,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Wrapper/Example/RCTWrapperExampleViewController.m

@@ -7,6 +7,8 @@
 
 #import "RCTWrapperExampleViewController.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <RCTWrapper/RCTWrapper.h>
 
 #import "RCTWrapperExampleView.h"
@@ -21,3 +23,5 @@
 @end
 
 RCT_WRAPPER_FOR_VIEW_CONTROLLER(RCTWrapperExampleViewController)
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.h

@@ -7,6 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 @class RCTBridge;
 
 NS_ASSUME_NONNULL_BEGIN
@@ -18,3 +20,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.m

@@ -7,6 +7,8 @@
 
 #import "RCTWrapperReactRootViewController.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <RCTWrapper/RCTWrapper.h>
 #import <React/RCTBridge.h>
 #import <React/RCTRootView.h>
@@ -44,3 +46,5 @@
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.h

@@ -7,6 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <RCTWrapper/RCTWrapperViewManager.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -16,3 +18,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.m

@@ -7,6 +7,8 @@
 
 #import "RCTWrapperReactRootViewManager.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <RCTWrapper/RCTWrapperView.h>
 #import <RCTWrapper/RCTWrapperViewControllerHostingView.h>
 
@@ -29,3 +31,5 @@ RCT_EXPORT_MODULE()
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Wrapper/RCTWrapper.h

@@ -7,6 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <RCTWrapper/RCTWrapperView.h>
 #import <RCTWrapper/RCTWrapperViewControllerHostingView.h>
 #import <RCTWrapper/RCTWrapperViewManager.h>
@@ -66,3 +68,5 @@
   }                                                                                                                    \
                                                                                                                        \
   @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Wrapper/RCTWrapperShadowView.h

@@ -7,6 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTShadowView.h>
 
 @class RCTBridge;
@@ -20,3 +22,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Wrapper/RCTWrapperShadowView.m

@@ -7,6 +7,8 @@
 
 #import "RCTWrapperShadowView.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTBridge.h>
 #import <React/RCTShadowView+Layout.h>
 #import <React/RCTUIManager.h>
@@ -132,3 +134,5 @@ static YGSize RCTWrapperShadowViewMeasure(
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Wrapper/RCTWrapperView.h

@@ -7,6 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 typedef CGSize (^RCTWrapperMeasureBlock)(CGSize minimumSize, CGSize maximumSize);
 
 @class RCTBridge;
@@ -34,3 +36,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Wrapper/RCTWrapperView.m

@@ -7,6 +7,8 @@
 
 #import "RCTWrapperView.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTBridge.h>
 #import <React/RCTUIManager.h>
 
@@ -93,3 +95,5 @@
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Wrapper/RCTWrapperViewControllerHostingView.h

@@ -7,6 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface RCTWrapperViewControllerHostingView : UIView
@@ -23,3 +25,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Wrapper/RCTWrapperViewControllerHostingView.m

@@ -7,6 +7,8 @@
 
 #import "RCTWrapperViewControllerHostingView.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/UIView+React.h>
 
 #pragma mark - UIViewController+Children
@@ -131,3 +133,5 @@
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Wrapper/RCTWrapperViewManager.h

@@ -7,6 +7,8 @@
 
 #import <React/RCTViewManager.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 @class RCTWrapperView;
 
 NS_ASSUME_NONNULL_BEGIN
@@ -18,3 +20,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/Libraries/Wrapper/RCTWrapperViewManager.m

@@ -7,6 +7,8 @@
 
 #import "RCTWrapperViewManager.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import "RCTWrapperShadowView.h"
 #import "RCTWrapperView.h"
 
@@ -25,3 +27,5 @@ RCT_EXPORT_MODULE()
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/RCTActivityIndicatorView.h

@@ -7,5 +7,9 @@
 
 #import <UIKit/UIKit.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 @interface RCTActivityIndicatorView : UIActivityIndicatorView
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/RCTActivityIndicatorView.m

@@ -7,6 +7,8 @@
 
 #import "RCTActivityIndicatorView.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 @implementation RCTActivityIndicatorView {
 }
 
@@ -20,3 +22,5 @@
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/RCTActivityIndicatorViewManager.h

@@ -7,6 +7,8 @@
 
 #import <React/RCTViewManager.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 @interface RCTConvert (UIActivityIndicatorView)
 
 + (UIActivityIndicatorViewStyle)UIActivityIndicatorViewStyle:(id)json;
@@ -16,3 +18,5 @@
 @interface RCTActivityIndicatorViewManager : RCTViewManager
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/RCTActivityIndicatorViewManager.m

@@ -7,6 +7,8 @@
 
 #import "RCTActivityIndicatorViewManager.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import "RCTActivityIndicatorView.h"
 #import "RCTConvert.h"
 
@@ -59,3 +61,5 @@ RCT_CUSTOM_VIEW_PROPERTY(animating, BOOL, UIActivityIndicatorView)
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/RCTDebuggingOverlayManager.h

@@ -7,6 +7,10 @@
 
 #import <React/RCTViewManager.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 @interface RCTDebuggingOverlayManager : RCTViewManager
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/RCTDebuggingOverlayManager.m

@@ -8,6 +8,8 @@
 #import "RCTDebuggingOverlayManager.h"
 #import "RCTDebuggingOverlay.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTLog.h>
 #import <React/RCTUIManager.h>
 
@@ -62,3 +64,5 @@ RCT_EXPORT_METHOD(clearElementsHighlights : (nonnull NSNumber *)viewTag)
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/RCTModalHostView.h

@@ -7,6 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTInvalidating.h>
 #import <React/RCTModalHostViewManager.h>
 #import <React/RCTView.h>
@@ -55,3 +57,5 @@
                     animated:(BOOL)animated;
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/RCTModalHostView.m

@@ -7,6 +7,8 @@
 
 #import "RCTModalHostView.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <UIKit/UIKit.h>
 
 #import "RCTAssert.h"
@@ -250,3 +252,5 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : coder)
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/RCTModalHostViewController.h

@@ -7,6 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 @interface RCTModalHostViewController : UIViewController
 
 @property (nonatomic, copy) void (^boundsDidChangeBlock)(CGRect newBounds);
@@ -14,3 +16,5 @@
 @property (nonatomic, assign) UIInterfaceOrientationMask supportedInterfaceOrientations;
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/RCTModalHostViewController.m

@@ -7,6 +7,8 @@
 
 #import "RCTModalHostViewController.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import "RCTLog.h"
 #import "RCTModalHostView.h"
 
@@ -68,3 +70,5 @@
 #endif // RCT_DEV
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/RCTModalHostViewManager.h

@@ -9,6 +9,8 @@
 #import <React/RCTInvalidating.h>
 #import <React/RCTViewManager.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 typedef void (^RCTModalViewInteractionBlock)(
     UIViewController *reactViewController,
     UIViewController *viewController,
@@ -26,3 +28,5 @@ typedef void (^RCTModalViewInteractionBlock)(
 @property (nonatomic, strong) RCTModalViewInteractionBlock dismissalBlock;
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/RCTModalHostViewManager.m

@@ -7,6 +7,8 @@
 
 #import "RCTModalHostViewManager.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import "RCTBridge.h"
 #import "RCTModalHostView.h"
 #import "RCTModalHostViewController.h"
@@ -125,3 +127,5 @@ RCT_EXPORT_VIEW_PROPERTY(allowSwipeDismissal, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(onDismiss, RCTDirectEventBlock)
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/RCTModalManager.h

@@ -7,6 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
 
@@ -15,3 +17,5 @@
 - (void)modalDismissed:(NSNumber *)modalID;
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/RCTModalManager.m

@@ -7,6 +7,8 @@
 
 #import "RCTModalManager.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 @interface RCTModalManager ()
 
 @property BOOL shouldEmit;
@@ -40,3 +42,5 @@ RCT_EXPORT_MODULE();
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/RCTRootShadowView.m

@@ -7,6 +7,8 @@
 
 #import "RCTRootShadowView.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import "RCTI18nUtil.h"
 #import "RCTShadowView+Layout.h"
 
@@ -39,3 +41,13 @@
 }
 
 @end
+
+#else // RCT_FIT_RM_OLD_COMPONENT
+
+@implementation RCTRootShadowView
+- (void)layoutWithAffectedShadowViews:(NSPointerArray *)affectedShadowViews
+{
+}
+@end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/RCTShadowView.m

@@ -16,6 +16,8 @@
 #import "UIView+Private.h"
 #import "UIView+React.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 typedef void (^RCTActionBlock)(RCTShadowView *shadowViewSelf, id value);
 typedef void (^RCTResetActionBlock)(RCTShadowView *shadowViewSelf);
 
@@ -735,3 +737,93 @@ RCT_STYLE_PROPERTY(AspectRatio, aspectRatio, AspectRatio, float)
 }
 
 @end
+
+#else // RCT_FIT_RM_OLD_COMPONENT
+@implementation RCTShadowView
+@synthesize reactTag = _reactTag;
+@synthesize rootTag = _rootTag;
+
++ (YGConfigRef)yogaConfig
+{
+  return YGConfigNew();
+}
+
+- (NSNumber *)reactTagAtPoint:(CGPoint)point
+{
+  return [NSNumber numberWithInt:0];
+}
+
+- (BOOL)isReactRootView
+{
+  return NO;
+}
+
+- (NSArray<RCTShadowView *> *)reactSubviews
+{
+  return @[];
+}
+- (RCTShadowView *)reactSuperview
+{
+  return nil;
+}
+- (void)insertReactSubview:(RCTShadowView *)subview atIndex:(NSInteger)atIndex
+{
+}
+- (void)removeReactSubview:(RCTShadowView *)subview
+{
+}
+
+- (void)setLocalData:(NSObject *)localData
+{
+}
+
+#pragma mark - Layout
+- (void)layoutWithMinimumSize:(CGSize)minimumSize
+                  maximumSize:(CGSize)maximumSize
+              layoutDirection:(UIUserInterfaceLayoutDirection)layoutDirection
+                layoutContext:(RCTLayoutContext)layoutContext
+{
+}
+
+- (void)layoutWithMetrics:(RCTLayoutMetrics)layoutMetrics layoutContext:(RCTLayoutContext)layoutContext
+{
+}
+
+- (void)layoutSubviewsWithContext:(RCTLayoutContext)layoutContext
+{
+}
+
+- (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize
+{
+  return CGSizeMake(0, 0);
+}
+
+- (BOOL)canHaveSubviews
+{
+  return NO;
+}
+
+- (BOOL)isYogaLeafNode
+{
+  return NO;
+}
+
+- (void)didUpdateReactSubviews
+{
+}
+- (void)didSetProps:(NSArray<NSString *> *)changedProps
+{
+}
+
+- (CGRect)measureLayoutRelativeToAncestor:(RCTShadowView *)ancestor
+{
+  return CGRectNull;
+}
+
+- (BOOL)viewIsDescendantOf:(RCTShadowView *)ancestor
+{
+  return NO;
+}
+
+@end
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/RCTSwitch.h

@@ -7,6 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTComponent.h>
 
 @interface RCTSwitch : UISwitch
@@ -15,3 +17,5 @@
 @property (nonatomic, copy) RCTBubblingEventBlock onChange;
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/RCTSwitch.m

@@ -7,6 +7,8 @@
 
 #import "RCTSwitch.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import "UIView+React.h"
 
 @implementation RCTSwitch
@@ -18,3 +20,5 @@
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/RCTSwitchManager.h

@@ -7,6 +7,10 @@
 
 #import <React/RCTViewManager.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 @interface RCTSwitchManager : RCTViewManager
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/RCTSwitchManager.m

@@ -7,6 +7,8 @@
 
 #import "RCTSwitchManager.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTUIManager.h>
 #import "RCTBridge.h"
 #import "RCTSwitch.h"
@@ -64,3 +66,5 @@ RCT_REMAP_VIEW_PROPERTY(trackColorForFalse, tintColor, UIColor);
 RCT_REMAP_VIEW_PROPERTY(trackColorForTrue, onTintColor, UIColor);
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/RefreshControl/RCTRefreshControl.h

@@ -7,6 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTComponent.h>
 #import <React/RCTScrollableProtocol.h>
 
@@ -17,3 +19,5 @@
 @property (nonatomic, weak) UIScrollView *scrollView;
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/RefreshControl/RCTRefreshControl.m

@@ -8,6 +8,8 @@
 #import "RCTRefreshControl.h"
 #import "RCTRefreshableProtocol.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import "RCTUtils.h"
 
 @interface RCTRefreshControl () <RCTRefreshableProtocol>
@@ -224,3 +226,5 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/RefreshControl/RCTRefreshControlManager.h

@@ -7,6 +7,10 @@
 
 #import <React/RCTViewManager.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 @interface RCTRefreshControlManager : RCTViewManager
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/RefreshControl/RCTRefreshControlManager.m

@@ -7,6 +7,8 @@
 
 #import <React/RCTUIManager.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import "RCTRefreshControl.h"
 #import "RCTRefreshControlManager.h"
 #import "RCTRefreshableProtocol.h"
@@ -41,3 +43,5 @@ RCT_EXPORT_METHOD(setNativeRefreshing : (nonnull NSNumber *)viewTag toRefreshing
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/SafeAreaView/RCTSafeAreaShadowView.h

@@ -7,6 +7,8 @@
 
 #import <React/RCTShadowView.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface RCTSafeAreaShadowView : RCTShadowView
@@ -14,3 +16,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/SafeAreaView/RCTSafeAreaShadowView.m

@@ -7,6 +7,8 @@
 
 #import "RCTSafeAreaShadowView.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTAssert.h>
 #import <yoga/Yoga.h>
 
@@ -51,3 +53,5 @@
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/SafeAreaView/RCTSafeAreaView.h

@@ -7,6 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTView.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -20,3 +22,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/SafeAreaView/RCTSafeAreaView.m

@@ -7,6 +7,8 @@
 
 #import "RCTSafeAreaView.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTBridge.h>
 #import <React/RCTUIManager.h>
 
@@ -73,3 +75,5 @@ static BOOL UIEdgeInsetsEqualToEdgeInsetsWithThreshold(UIEdgeInsets insets1, UIE
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.h

@@ -7,6 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface RCTSafeAreaViewLocalData : NSObject
@@ -18,3 +20,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.m

@@ -7,6 +7,8 @@
 
 #import "RCTSafeAreaViewLocalData.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 @implementation RCTSafeAreaViewLocalData
 
 - (instancetype)initWithInsets:(UIEdgeInsets)insets
@@ -19,3 +21,5 @@
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/SafeAreaView/RCTSafeAreaViewManager.h

@@ -7,6 +7,8 @@
 
 #import <React/RCTViewManager.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface RCTSafeAreaViewManager : RCTViewManager
@@ -14,3 +16,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/SafeAreaView/RCTSafeAreaViewManager.m

@@ -7,6 +7,8 @@
 
 #import "RCTSafeAreaViewManager.h"
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import "RCTSafeAreaShadowView.h"
 #import "RCTSafeAreaView.h"
 #import "RCTUIManager.h"
@@ -26,3 +28,5 @@ RCT_EXPORT_MODULE()
 }
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT

packages/react-native/React/Views/ScrollView/RCTScrollContentShadowView.h

@@ -7,8 +7,12 @@
 
 #import <UIKit/UIKit.h>
 
+#ifndef RCT_FIT_RM_OLD_COMPONENT
+
 #import <React/RCTShadowView.h>
 
 @interface RCTScrollContentShadowView : RCTShadowView
 
 @end
+
+#endif // RCT_FIT_RM_OLD_COMPONENT