From 9c8a4c22973c7ce6fcf6b5d22c6d5fd4c6dc0d92 Mon Sep 17 00:00:00 2001 From: Ramanpreet Nara Date: Fri, 1 Aug 2025 15:43:55 -0700 Subject: [PATCH] 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 --- .../Libraries/Image/RCTImageShadowView.h | 4 + .../Libraries/Image/RCTImageShadowView.mm | 4 + .../Libraries/Image/RCTImageView.h | 4 + .../Libraries/Image/RCTImageView.mm | 4 + .../Libraries/Image/RCTImageViewManager.h | 4 + .../Libraries/Image/RCTImageViewManager.mm | 4 + .../Text/BaseText/RCTBaseTextShadowView.h | 4 + .../Text/BaseText/RCTBaseTextShadowView.mm | 4 + .../Text/BaseText/RCTBaseTextViewManager.h | 4 + .../Text/BaseText/RCTBaseTextViewManager.mm | 4 + .../Libraries/Text/RCTTextAttributes.h | 4 + .../Libraries/Text/RCTTextAttributes.mm | 4 + .../Text/RawText/RCTRawTextShadowView.h | 4 + .../Text/RawText/RCTRawTextShadowView.mm | 4 + .../Text/RawText/RCTRawTextViewManager.h | 4 + .../Text/RawText/RCTRawTextViewManager.mm | 4 + .../Libraries/Text/Text/RCTTextShadowView.h | 4 + .../Libraries/Text/Text/RCTTextShadowView.mm | 4 + .../Libraries/Text/Text/RCTTextView.h | 4 + .../Libraries/Text/Text/RCTTextView.mm | 4 + .../Libraries/Text/Text/RCTTextViewManager.h | 4 + .../Libraries/Text/Text/RCTTextViewManager.mm | 4 + .../Multiline/RCTMultilineTextInputView.h | 4 + .../Multiline/RCTMultilineTextInputView.mm | 4 + .../RCTMultilineTextInputViewManager.h | 4 + .../RCTMultilineTextInputViewManager.mm | 4 + .../TextInput/RCTBaseTextInputShadowView.h | 4 + .../TextInput/RCTBaseTextInputShadowView.mm | 4 + .../Text/TextInput/RCTBaseTextInputView.h | 4 + .../Text/TextInput/RCTBaseTextInputView.mm | 4 + .../TextInput/RCTBaseTextInputViewManager.h | 4 + .../TextInput/RCTBaseTextInputViewManager.mm | 4 + .../TextInput/RCTInputAccessoryShadowView.h | 4 + .../TextInput/RCTInputAccessoryShadowView.mm | 4 + .../Text/TextInput/RCTInputAccessoryView.h | 4 + .../Text/TextInput/RCTInputAccessoryView.mm | 4 + .../TextInput/RCTInputAccessoryViewContent.h | 4 + .../TextInput/RCTInputAccessoryViewContent.mm | 4 + .../TextInput/RCTInputAccessoryViewManager.h | 4 + .../TextInput/RCTInputAccessoryViewManager.mm | 4 + .../Singleline/RCTSinglelineTextInputView.h | 4 + .../Singleline/RCTSinglelineTextInputView.mm | 4 + .../RCTSinglelineTextInputViewManager.h | 4 + .../RCTSinglelineTextInputViewManager.mm | 4 + .../VirtualText/RCTVirtualTextShadowView.h | 4 + .../VirtualText/RCTVirtualTextShadowView.mm | 4 + .../Text/VirtualText/RCTVirtualTextView.h | 4 + .../Text/VirtualText/RCTVirtualTextView.mm | 4 + .../VirtualText/RCTVirtualTextViewManager.h | 4 + .../VirtualText/RCTVirtualTextViewManager.mm | 4 + .../Wrapper/Example/RCTWrapperExampleView.h | 4 + .../Wrapper/Example/RCTWrapperExampleView.m | 4 + .../Example/RCTWrapperExampleViewController.h | 4 + .../Example/RCTWrapperExampleViewController.m | 4 + .../RCTWrapperReactRootViewController.h | 4 + .../RCTWrapperReactRootViewController.m | 4 + .../Example/RCTWrapperReactRootViewManager.h | 4 + .../Example/RCTWrapperReactRootViewManager.m | 4 + .../Libraries/Wrapper/RCTWrapper.h | 4 + .../Libraries/Wrapper/RCTWrapperShadowView.h | 4 + .../Libraries/Wrapper/RCTWrapperShadowView.m | 4 + .../Libraries/Wrapper/RCTWrapperView.h | 4 + .../Libraries/Wrapper/RCTWrapperView.m | 4 + .../RCTWrapperViewControllerHostingView.h | 4 + .../RCTWrapperViewControllerHostingView.m | 4 + .../Libraries/Wrapper/RCTWrapperViewManager.h | 4 + .../Libraries/Wrapper/RCTWrapperViewManager.m | 4 + .../React/Views/RCTActivityIndicatorView.h | 4 + .../React/Views/RCTActivityIndicatorView.m | 4 + .../Views/RCTActivityIndicatorViewManager.h | 4 + .../Views/RCTActivityIndicatorViewManager.m | 4 + .../React/Views/RCTDebuggingOverlayManager.h | 4 + .../React/Views/RCTDebuggingOverlayManager.m | 4 + .../React/Views/RCTModalHostView.h | 4 + .../React/Views/RCTModalHostView.m | 4 + .../React/Views/RCTModalHostViewController.h | 4 + .../React/Views/RCTModalHostViewController.m | 4 + .../React/Views/RCTModalHostViewManager.h | 4 + .../React/Views/RCTModalHostViewManager.m | 4 + .../React/Views/RCTModalManager.h | 4 + .../React/Views/RCTModalManager.m | 4 + .../React/Views/RCTRootShadowView.m | 12 +++ .../react-native/React/Views/RCTShadowView.m | 92 +++++++++++++++++++ packages/react-native/React/Views/RCTSwitch.h | 4 + packages/react-native/React/Views/RCTSwitch.m | 4 + .../React/Views/RCTSwitchManager.h | 4 + .../React/Views/RCTSwitchManager.m | 4 + .../Views/RefreshControl/RCTRefreshControl.h | 4 + .../Views/RefreshControl/RCTRefreshControl.m | 4 + .../RefreshControl/RCTRefreshControlManager.h | 4 + .../RefreshControl/RCTRefreshControlManager.m | 4 + .../SafeAreaView/RCTSafeAreaShadowView.h | 4 + .../SafeAreaView/RCTSafeAreaShadowView.m | 4 + .../Views/SafeAreaView/RCTSafeAreaView.h | 4 + .../Views/SafeAreaView/RCTSafeAreaView.m | 4 + .../SafeAreaView/RCTSafeAreaViewLocalData.h | 4 + .../SafeAreaView/RCTSafeAreaViewLocalData.m | 4 + .../SafeAreaView/RCTSafeAreaViewManager.h | 4 + .../SafeAreaView/RCTSafeAreaViewManager.m | 4 + .../ScrollView/RCTScrollContentShadowView.h | 4 + .../ScrollView/RCTScrollContentShadowView.m | 4 + .../Views/ScrollView/RCTScrollContentView.h | 4 + .../Views/ScrollView/RCTScrollContentView.m | 4 + .../ScrollView/RCTScrollContentViewManager.h | 4 + .../ScrollView/RCTScrollContentViewManager.m | 4 + .../React/Views/ScrollView/RCTScrollView.h | 4 + .../React/Views/ScrollView/RCTScrollView.m | 4 + .../Views/ScrollView/RCTScrollViewManager.h | 4 + .../Views/ScrollView/RCTScrollViewManager.m | 4 + 109 files changed, 532 insertions(+) diff --git a/packages/react-native/Libraries/Image/RCTImageShadowView.h b/packages/react-native/Libraries/Image/RCTImageShadowView.h index 8333da31521..c2c37cbfa9c 100644 --- a/packages/react-native/Libraries/Image/RCTImageShadowView.h +++ b/packages/react-native/Libraries/Image/RCTImageShadowView.h @@ -7,6 +7,10 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + @interface RCTImageShadowView : RCTShadowView @end + +#endif diff --git a/packages/react-native/Libraries/Image/RCTImageShadowView.mm b/packages/react-native/Libraries/Image/RCTImageShadowView.mm index bfdad70f342..026a04eaf37 100644 --- a/packages/react-native/Libraries/Image/RCTImageShadowView.mm +++ b/packages/react-native/Libraries/Image/RCTImageShadowView.mm @@ -9,6 +9,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + @implementation RCTImageShadowView - (BOOL)isYogaLeafNode @@ -22,3 +24,5 @@ } @end + +#endif diff --git a/packages/react-native/Libraries/Image/RCTImageView.h b/packages/react-native/Libraries/Image/RCTImageView.h index da7f860228c..4abd7864850 100644 --- a/packages/react-native/Libraries/Image/RCTImageView.h +++ b/packages/react-native/Libraries/Image/RCTImageView.h @@ -9,6 +9,8 @@ #import #import +#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 diff --git a/packages/react-native/Libraries/Image/RCTImageView.mm b/packages/react-native/Libraries/Image/RCTImageView.mm index 3e65fca9321..54383ed8029 100644 --- a/packages/react-native/Libraries/Image/RCTImageView.mm +++ b/packages/react-native/Libraries/Image/RCTImageView.mm @@ -17,6 +17,8 @@ #import #import +#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 diff --git a/packages/react-native/Libraries/Image/RCTImageViewManager.h b/packages/react-native/Libraries/Image/RCTImageViewManager.h index 8202aab1d38..5897567ea11 100644 --- a/packages/react-native/Libraries/Image/RCTImageViewManager.h +++ b/packages/react-native/Libraries/Image/RCTImageViewManager.h @@ -7,6 +7,10 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + @interface RCTImageViewManager : RCTViewManager @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Image/RCTImageViewManager.mm b/packages/react-native/Libraries/Image/RCTImageViewManager.mm index 19ecaf7ee2c..cc83c2b1f91 100644 --- a/packages/react-native/Libraries/Image/RCTImageViewManager.mm +++ b/packages/react-native/Libraries/Image/RCTImageViewManager.mm @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import @@ -114,3 +116,5 @@ RCT_EXPORT_METHOD(queryCache } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Text/BaseText/RCTBaseTextShadowView.h b/packages/react-native/Libraries/Text/BaseText/RCTBaseTextShadowView.h index e87ad210d0d..71da41b89e8 100644 --- a/packages/react-native/Libraries/Text/BaseText/RCTBaseTextShadowView.h +++ b/packages/react-native/Libraries/Text/BaseText/RCTBaseTextShadowView.h @@ -7,6 +7,8 @@ #import +#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 diff --git a/packages/react-native/Libraries/Text/BaseText/RCTBaseTextShadowView.mm b/packages/react-native/Libraries/Text/BaseText/RCTBaseTextShadowView.mm index eab17f67dd7..063d5bf6c58 100644 --- a/packages/react-native/Libraries/Text/BaseText/RCTBaseTextShadowView.mm +++ b/packages/react-native/Libraries/Text/BaseText/RCTBaseTextShadowView.mm @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import @@ -156,3 +158,5 @@ static void RCTInlineViewYogaNodeDirtied(YGNodeConstRef node) } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Text/BaseText/RCTBaseTextViewManager.h b/packages/react-native/Libraries/Text/BaseText/RCTBaseTextViewManager.h index 56f63c36702..7f865aa620d 100644 --- a/packages/react-native/Libraries/Text/BaseText/RCTBaseTextViewManager.h +++ b/packages/react-native/Libraries/Text/BaseText/RCTBaseTextViewManager.h @@ -7,6 +7,8 @@ #import +#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 diff --git a/packages/react-native/Libraries/Text/BaseText/RCTBaseTextViewManager.mm b/packages/react-native/Libraries/Text/BaseText/RCTBaseTextViewManager.mm index e9ce272b5f5..8546e4316ed 100644 --- a/packages/react-native/Libraries/Text/BaseText/RCTBaseTextViewManager.mm +++ b/packages/react-native/Libraries/Text/BaseText/RCTBaseTextViewManager.mm @@ -7,6 +7,8 @@ #import +#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 diff --git a/packages/react-native/Libraries/Text/RCTTextAttributes.h b/packages/react-native/Libraries/Text/RCTTextAttributes.h index 1b72abe51df..7f50eb7b62b 100644 --- a/packages/react-native/Libraries/Text/RCTTextAttributes.h +++ b/packages/react-native/Libraries/Text/RCTTextAttributes.h @@ -11,6 +11,8 @@ #import #import +#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 diff --git a/packages/react-native/Libraries/Text/RCTTextAttributes.mm b/packages/react-native/Libraries/Text/RCTTextAttributes.mm index 43dd1f7c18e..963f25b4992 100644 --- a/packages/react-native/Libraries/Text/RCTTextAttributes.mm +++ b/packages/react-native/Libraries/Text/RCTTextAttributes.mm @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import #import @@ -352,3 +354,5 @@ static NSString *capitalizeText(NSString *text) } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Text/RawText/RCTRawTextShadowView.h b/packages/react-native/Libraries/Text/RawText/RCTRawTextShadowView.h index cc4c4d7082c..ad1dd0e107d 100644 --- a/packages/react-native/Libraries/Text/RawText/RCTRawTextShadowView.h +++ b/packages/react-native/Libraries/Text/RawText/RCTRawTextShadowView.h @@ -7,6 +7,8 @@ #import +#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 diff --git a/packages/react-native/Libraries/Text/RawText/RCTRawTextShadowView.mm b/packages/react-native/Libraries/Text/RawText/RCTRawTextShadowView.mm index 0ad4ecad42e..bc8917a69e7 100644 --- a/packages/react-native/Libraries/Text/RawText/RCTRawTextShadowView.mm +++ b/packages/react-native/Libraries/Text/RawText/RCTRawTextShadowView.mm @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import @implementation RCTRawTextShadowView @@ -32,3 +34,5 @@ } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Text/RawText/RCTRawTextViewManager.h b/packages/react-native/Libraries/Text/RawText/RCTRawTextViewManager.h index 03a8a7586aa..2be0f052d7b 100644 --- a/packages/react-native/Libraries/Text/RawText/RCTRawTextViewManager.h +++ b/packages/react-native/Libraries/Text/RawText/RCTRawTextViewManager.h @@ -7,6 +7,8 @@ #import +#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 diff --git a/packages/react-native/Libraries/Text/RawText/RCTRawTextViewManager.mm b/packages/react-native/Libraries/Text/RawText/RCTRawTextViewManager.mm index f872536ac4c..5965dc515bc 100644 --- a/packages/react-native/Libraries/Text/RawText/RCTRawTextViewManager.mm +++ b/packages/react-native/Libraries/Text/RawText/RCTRawTextViewManager.mm @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import @implementation RCTRawTextViewManager @@ -26,3 +28,5 @@ RCT_EXPORT_MODULE(RCTRawText) RCT_EXPORT_SHADOW_PROPERTY(text, NSString) @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Text/Text/RCTTextShadowView.h b/packages/react-native/Libraries/Text/Text/RCTTextShadowView.h index f3202b5fd37..1bffce0e0e0 100644 --- a/packages/react-native/Libraries/Text/Text/RCTTextShadowView.h +++ b/packages/react-native/Libraries/Text/Text/RCTTextShadowView.h @@ -7,6 +7,8 @@ #import +#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 diff --git a/packages/react-native/Libraries/Text/Text/RCTTextShadowView.mm b/packages/react-native/Libraries/Text/Text/RCTTextShadowView.mm index 6c815d267ee..50f28cf9a16 100644 --- a/packages/react-native/Libraries/Text/Text/RCTTextShadowView.mm +++ b/packages/react-native/Libraries/Text/Text/RCTTextShadowView.mm @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import #import @@ -464,3 +466,5 @@ static float RCTTextShadowViewBaseline(YGNodeConstRef node, const float width, c } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Text/Text/RCTTextView.h b/packages/react-native/Libraries/Text/Text/RCTTextView.h index 4858dd8cf40..03e4f1422b9 100644 --- a/packages/react-native/Libraries/Text/Text/RCTTextView.h +++ b/packages/react-native/Libraries/Text/Text/RCTTextView.h @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import NS_ASSUME_NONNULL_BEGIN @@ -27,3 +29,5 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Text/Text/RCTTextView.mm b/packages/react-native/Libraries/Text/Text/RCTTextView.mm index 47632aa885c..5a4021d740a 100644 --- a/packages/react-native/Libraries/Text/Text/RCTTextView.mm +++ b/packages/react-native/Libraries/Text/Text/RCTTextView.mm @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import @@ -292,3 +294,5 @@ } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Text/Text/RCTTextViewManager.h b/packages/react-native/Libraries/Text/Text/RCTTextViewManager.h index 4c5db002cbf..13f374892ba 100644 --- a/packages/react-native/Libraries/Text/Text/RCTTextViewManager.h +++ b/packages/react-native/Libraries/Text/Text/RCTTextViewManager.h @@ -7,8 +7,12 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import "RCTBaseTextViewManager.h" @interface RCTTextViewManager : RCTBaseTextViewManager @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Text/Text/RCTTextViewManager.mm b/packages/react-native/Libraries/Text/Text/RCTTextViewManager.mm index 7fec0b7b58b..8da8dd6d3ba 100644 --- a/packages/react-native/Libraries/Text/Text/RCTTextViewManager.mm +++ b/packages/react-native/Libraries/Text/Text/RCTTextViewManager.mm @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import #import @@ -91,3 +93,5 @@ RCT_EXPORT_VIEW_PROPERTY(selectable, BOOL) } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.h b/packages/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.h index bd183de3a59..838600e75c6 100644 --- a/packages/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.h +++ b/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 diff --git a/packages/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.mm b/packages/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.mm index e3a7c6be60e..261095ade1c 100644 --- a/packages/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.mm +++ b/packages/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.mm @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import @@ -61,3 +63,5 @@ } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.h b/packages/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.h index fe8dbc34e7f..e03d70bcc79 100644 --- a/packages/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.h +++ b/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 diff --git a/packages/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.mm b/packages/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.mm index e729bb7a222..e6018b040ed 100644 --- a/packages/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.mm +++ b/packages/react-native/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.mm @@ -8,6 +8,8 @@ #import #import +#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 diff --git a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputShadowView.h b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputShadowView.h index 8f4cf7eb1b5..73522039780 100644 --- a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputShadowView.h +++ b/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 diff --git a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputShadowView.mm b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputShadowView.mm index 8f151c25f91..da267590f23 100644 --- a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputShadowView.mm +++ b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputShadowView.mm @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import #import @@ -362,3 +364,5 @@ static float RCTTextInputShadowViewBaseline(YGNodeConstRef node, const float wid } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.h b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.h index 48046242d7e..278f5a90a65 100644 --- a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.h +++ b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.h @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import "RCTBackedTextInputDelegate.h" @@ -61,3 +63,5 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm index 6a2d4f8f70a..66f6dad58f4 100644 --- a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm +++ b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import #import @@ -840,3 +842,5 @@ static BOOL findMismatch(NSString *first, NSString *second, NSRange *firstRange, } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.h b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.h index 1a9b1a96bb5..c51110c7f50 100644 --- a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.h +++ b/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 diff --git a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.mm b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.mm index 47adc535400..e3d7d205457 100644 --- a/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.mm +++ b/packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.mm @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import #import @@ -178,3 +180,5 @@ RCT_EXPORT_METHOD(setTextAndSelection } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryShadowView.h b/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryShadowView.h index 8f7ecb81bbd..02313c782bc 100644 --- a/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryShadowView.h +++ b/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryShadowView.h @@ -7,6 +7,10 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + @interface RCTInputAccessoryShadowView : RCTShadowView @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryShadowView.mm b/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryShadowView.mm index ebe514e037f..64cc7949675 100644 --- a/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryShadowView.mm +++ b/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryShadowView.mm @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import @implementation RCTInputAccessoryShadowView @@ -18,3 +20,5 @@ } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryView.h b/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryView.h index f86370ce5cb..415c8e97292 100644 --- a/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryView.h +++ b/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryView.h @@ -7,6 +7,8 @@ #import +#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 diff --git a/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryView.mm b/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryView.mm index f41263651b7..50106e95283 100644 --- a/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryView.mm +++ b/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryView.mm @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import #import @@ -76,3 +78,5 @@ } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewContent.h b/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewContent.h index e07b07d785b..6f58d48a4ec 100644 --- a/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewContent.h +++ b/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewContent.h @@ -7,6 +7,10 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + @interface RCTInputAccessoryViewContent : UIView @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewContent.mm b/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewContent.mm index 1c0a5612a58..4433e3779d7 100644 --- a/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewContent.mm +++ b/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewContent.mm @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import @implementation RCTInputAccessoryViewContent { @@ -72,3 +74,5 @@ } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewManager.h b/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewManager.h index 4f1cc324946..5e0f1396a5e 100644 --- a/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewManager.h +++ b/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewManager.h @@ -7,6 +7,10 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + @interface RCTInputAccessoryViewManager : RCTViewManager @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewManager.mm b/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewManager.mm index 7814f9c706a..583646edb15 100644 --- a/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewManager.mm +++ b/packages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewManager.mm @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import @@ -27,3 +29,5 @@ RCT_EXPORT_MODULE() RCT_REMAP_VIEW_PROPERTY(backgroundColor, inputAccessoryView.backgroundColor, UIColor) @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.h b/packages/react-native/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.h index 4846f7d7701..26d83797f09 100644 --- a/packages/react-native/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.h +++ b/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 diff --git a/packages/react-native/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.mm b/packages/react-native/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.mm index eeb15693210..4a7fc557d7a 100644 --- a/packages/react-native/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.mm +++ b/packages/react-native/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.mm @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import @@ -37,3 +39,5 @@ } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.h b/packages/react-native/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.h index 6134ddba498..e2c924587fb 100644 --- a/packages/react-native/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.h +++ b/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 diff --git a/packages/react-native/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.mm b/packages/react-native/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.mm index 413ac422387..f07ce01c44c 100644 --- a/packages/react-native/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.mm +++ b/packages/react-native/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.mm @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import @@ -29,3 +31,5 @@ RCT_EXPORT_MODULE() } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextShadowView.h b/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextShadowView.h index eed172619f7..2b069f122fd 100644 --- a/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextShadowView.h +++ b/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 diff --git a/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextShadowView.mm b/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextShadowView.mm index e83bd8f0395..8b6cc4a14a9 100644 --- a/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextShadowView.mm +++ b/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextShadowView.mm @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import @@ -36,3 +38,5 @@ } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextView.h b/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextView.h index 567a4a0f9ad..c2643c6c79e 100644 --- a/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextView.h +++ b/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextView.h @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import NS_ASSUME_NONNULL_BEGIN @@ -21,3 +23,5 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextView.mm b/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextView.mm index 7db2719da03..f0540260f9e 100644 --- a/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextView.mm +++ b/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextView.mm @@ -7,6 +7,10 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + @implementation RCTVirtualTextView @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextViewManager.h b/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextViewManager.h index 2b388086ef9..3f1d74014ba 100644 --- a/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextViewManager.h +++ b/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 diff --git a/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextViewManager.mm b/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextViewManager.mm index 313f1103a72..afd13a470c5 100644 --- a/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextViewManager.mm +++ b/packages/react-native/Libraries/Text/VirtualText/RCTVirtualTextViewManager.mm @@ -9,6 +9,8 @@ #import #import +#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 diff --git a/packages/react-native/Libraries/Wrapper/Example/RCTWrapperExampleView.h b/packages/react-native/Libraries/Wrapper/Example/RCTWrapperExampleView.h index 3d5885cdeab..2a8a55ddc62 100644 --- a/packages/react-native/Libraries/Wrapper/Example/RCTWrapperExampleView.h +++ b/packages/react-native/Libraries/Wrapper/Example/RCTWrapperExampleView.h @@ -7,6 +7,8 @@ #import +#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 diff --git a/packages/react-native/Libraries/Wrapper/Example/RCTWrapperExampleView.m b/packages/react-native/Libraries/Wrapper/Example/RCTWrapperExampleView.m index 082c032ad0f..47a5033eb21 100644 --- a/packages/react-native/Libraries/Wrapper/Example/RCTWrapperExampleView.m +++ b/packages/react-native/Libraries/Wrapper/Example/RCTWrapperExampleView.m @@ -7,6 +7,8 @@ #import "RCTWrapperExampleView.h" +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import @implementation RCTWrapperExampleView { @@ -51,3 +53,5 @@ @end RCT_WRAPPER_FOR_VIEW(RCTWrapperExampleView) + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Wrapper/Example/RCTWrapperExampleViewController.h b/packages/react-native/Libraries/Wrapper/Example/RCTWrapperExampleViewController.h index fb0f3ed35a7..70893ee2af9 100644 --- a/packages/react-native/Libraries/Wrapper/Example/RCTWrapperExampleViewController.h +++ b/packages/react-native/Libraries/Wrapper/Example/RCTWrapperExampleViewController.h @@ -7,6 +7,8 @@ #import +#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 diff --git a/packages/react-native/Libraries/Wrapper/Example/RCTWrapperExampleViewController.m b/packages/react-native/Libraries/Wrapper/Example/RCTWrapperExampleViewController.m index 445fec61416..f94fdd156d9 100644 --- a/packages/react-native/Libraries/Wrapper/Example/RCTWrapperExampleViewController.m +++ b/packages/react-native/Libraries/Wrapper/Example/RCTWrapperExampleViewController.m @@ -7,6 +7,8 @@ #import "RCTWrapperExampleViewController.h" +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import "RCTWrapperExampleView.h" @@ -21,3 +23,5 @@ @end RCT_WRAPPER_FOR_VIEW_CONTROLLER(RCTWrapperExampleViewController) + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.h b/packages/react-native/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.h index 4035c856a33..2225b2529d8 100644 --- a/packages/react-native/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.h +++ b/packages/react-native/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.h @@ -7,6 +7,8 @@ #import +#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 diff --git a/packages/react-native/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.m b/packages/react-native/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.m index ced28cb59d4..c7c09b172e3 100644 --- a/packages/react-native/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.m +++ b/packages/react-native/Libraries/Wrapper/Example/RCTWrapperReactRootViewController.m @@ -7,6 +7,8 @@ #import "RCTWrapperReactRootViewController.h" +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import #import @@ -44,3 +46,5 @@ } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.h b/packages/react-native/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.h index 68f99f529fd..51f634e5e9f 100644 --- a/packages/react-native/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.h +++ b/packages/react-native/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.h @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import NS_ASSUME_NONNULL_BEGIN @@ -16,3 +18,5 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.m b/packages/react-native/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.m index b50e755fef9..bb436859b57 100644 --- a/packages/react-native/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.m +++ b/packages/react-native/Libraries/Wrapper/Example/RCTWrapperReactRootViewManager.m @@ -7,6 +7,8 @@ #import "RCTWrapperReactRootViewManager.h" +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import @@ -29,3 +31,5 @@ RCT_EXPORT_MODULE() } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Wrapper/RCTWrapper.h b/packages/react-native/Libraries/Wrapper/RCTWrapper.h index 579e73a6389..392a280cc85 100644 --- a/packages/react-native/Libraries/Wrapper/RCTWrapper.h +++ b/packages/react-native/Libraries/Wrapper/RCTWrapper.h @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import #import @@ -66,3 +68,5 @@ } \ \ @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Wrapper/RCTWrapperShadowView.h b/packages/react-native/Libraries/Wrapper/RCTWrapperShadowView.h index a5e969814db..61e74193c0a 100644 --- a/packages/react-native/Libraries/Wrapper/RCTWrapperShadowView.h +++ b/packages/react-native/Libraries/Wrapper/RCTWrapperShadowView.h @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import @class RCTBridge; @@ -20,3 +22,5 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Wrapper/RCTWrapperShadowView.m b/packages/react-native/Libraries/Wrapper/RCTWrapperShadowView.m index 1425767be5c..00149daa770 100644 --- a/packages/react-native/Libraries/Wrapper/RCTWrapperShadowView.m +++ b/packages/react-native/Libraries/Wrapper/RCTWrapperShadowView.m @@ -7,6 +7,8 @@ #import "RCTWrapperShadowView.h" +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import #import @@ -132,3 +134,5 @@ static YGSize RCTWrapperShadowViewMeasure( } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Wrapper/RCTWrapperView.h b/packages/react-native/Libraries/Wrapper/RCTWrapperView.h index dc46ec588b5..8131b147348 100644 --- a/packages/react-native/Libraries/Wrapper/RCTWrapperView.h +++ b/packages/react-native/Libraries/Wrapper/RCTWrapperView.h @@ -7,6 +7,8 @@ #import +#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 diff --git a/packages/react-native/Libraries/Wrapper/RCTWrapperView.m b/packages/react-native/Libraries/Wrapper/RCTWrapperView.m index a3b9ef63640..b3d42a5d10a 100644 --- a/packages/react-native/Libraries/Wrapper/RCTWrapperView.m +++ b/packages/react-native/Libraries/Wrapper/RCTWrapperView.m @@ -7,6 +7,8 @@ #import "RCTWrapperView.h" +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import @@ -93,3 +95,5 @@ } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Wrapper/RCTWrapperViewControllerHostingView.h b/packages/react-native/Libraries/Wrapper/RCTWrapperViewControllerHostingView.h index c8dff426c3a..fb98b4b821f 100644 --- a/packages/react-native/Libraries/Wrapper/RCTWrapperViewControllerHostingView.h +++ b/packages/react-native/Libraries/Wrapper/RCTWrapperViewControllerHostingView.h @@ -7,6 +7,8 @@ #import +#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 diff --git a/packages/react-native/Libraries/Wrapper/RCTWrapperViewControllerHostingView.m b/packages/react-native/Libraries/Wrapper/RCTWrapperViewControllerHostingView.m index 0a433de602b..adca32c2ffa 100644 --- a/packages/react-native/Libraries/Wrapper/RCTWrapperViewControllerHostingView.m +++ b/packages/react-native/Libraries/Wrapper/RCTWrapperViewControllerHostingView.m @@ -7,6 +7,8 @@ #import "RCTWrapperViewControllerHostingView.h" +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #pragma mark - UIViewController+Children @@ -131,3 +133,5 @@ } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/Libraries/Wrapper/RCTWrapperViewManager.h b/packages/react-native/Libraries/Wrapper/RCTWrapperViewManager.h index 0eccdc4b0b2..de6d6e35d16 100644 --- a/packages/react-native/Libraries/Wrapper/RCTWrapperViewManager.h +++ b/packages/react-native/Libraries/Wrapper/RCTWrapperViewManager.h @@ -7,6 +7,8 @@ #import +#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 diff --git a/packages/react-native/Libraries/Wrapper/RCTWrapperViewManager.m b/packages/react-native/Libraries/Wrapper/RCTWrapperViewManager.m index d4317e2cff9..0dc05009f9f 100644 --- a/packages/react-native/Libraries/Wrapper/RCTWrapperViewManager.m +++ b/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 diff --git a/packages/react-native/React/Views/RCTActivityIndicatorView.h b/packages/react-native/React/Views/RCTActivityIndicatorView.h index 1d5015501e5..20a66009b62 100644 --- a/packages/react-native/React/Views/RCTActivityIndicatorView.h +++ b/packages/react-native/React/Views/RCTActivityIndicatorView.h @@ -7,5 +7,9 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + @interface RCTActivityIndicatorView : UIActivityIndicatorView @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/React/Views/RCTActivityIndicatorView.m b/packages/react-native/React/Views/RCTActivityIndicatorView.m index 14c9fb17f6a..6caa225688b 100644 --- a/packages/react-native/React/Views/RCTActivityIndicatorView.m +++ b/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 diff --git a/packages/react-native/React/Views/RCTActivityIndicatorViewManager.h b/packages/react-native/React/Views/RCTActivityIndicatorViewManager.h index 2d31e2cf98b..44b2f74b7aa 100644 --- a/packages/react-native/React/Views/RCTActivityIndicatorViewManager.h +++ b/packages/react-native/React/Views/RCTActivityIndicatorViewManager.h @@ -7,6 +7,8 @@ #import +#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 diff --git a/packages/react-native/React/Views/RCTActivityIndicatorViewManager.m b/packages/react-native/React/Views/RCTActivityIndicatorViewManager.m index dcd08954943..333c2b33b84 100644 --- a/packages/react-native/React/Views/RCTActivityIndicatorViewManager.m +++ b/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 diff --git a/packages/react-native/React/Views/RCTDebuggingOverlayManager.h b/packages/react-native/React/Views/RCTDebuggingOverlayManager.h index a852cc81883..989f60324aa 100644 --- a/packages/react-native/React/Views/RCTDebuggingOverlayManager.h +++ b/packages/react-native/React/Views/RCTDebuggingOverlayManager.h @@ -7,6 +7,10 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + @interface RCTDebuggingOverlayManager : RCTViewManager @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/React/Views/RCTDebuggingOverlayManager.m b/packages/react-native/React/Views/RCTDebuggingOverlayManager.m index 16102ab8208..5fe0d01e3fa 100644 --- a/packages/react-native/React/Views/RCTDebuggingOverlayManager.m +++ b/packages/react-native/React/Views/RCTDebuggingOverlayManager.m @@ -8,6 +8,8 @@ #import "RCTDebuggingOverlayManager.h" #import "RCTDebuggingOverlay.h" +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import @@ -62,3 +64,5 @@ RCT_EXPORT_METHOD(clearElementsHighlights : (nonnull NSNumber *)viewTag) } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/React/Views/RCTModalHostView.h b/packages/react-native/React/Views/RCTModalHostView.h index c7811587c60..e8abaf28485 100644 --- a/packages/react-native/React/Views/RCTModalHostView.h +++ b/packages/react-native/React/Views/RCTModalHostView.h @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import #import @@ -55,3 +57,5 @@ animated:(BOOL)animated; @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/React/Views/RCTModalHostView.m b/packages/react-native/React/Views/RCTModalHostView.m index 475802f3351..03684a8032a 100644 --- a/packages/react-native/React/Views/RCTModalHostView.m +++ b/packages/react-native/React/Views/RCTModalHostView.m @@ -7,6 +7,8 @@ #import "RCTModalHostView.h" +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import "RCTAssert.h" @@ -250,3 +252,5 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : coder) } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/React/Views/RCTModalHostViewController.h b/packages/react-native/React/Views/RCTModalHostViewController.h index b12b0f7fc15..2146da35a87 100644 --- a/packages/react-native/React/Views/RCTModalHostViewController.h +++ b/packages/react-native/React/Views/RCTModalHostViewController.h @@ -7,6 +7,8 @@ #import +#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 diff --git a/packages/react-native/React/Views/RCTModalHostViewController.m b/packages/react-native/React/Views/RCTModalHostViewController.m index f0277f8c35e..90c5c852aae 100644 --- a/packages/react-native/React/Views/RCTModalHostViewController.m +++ b/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 diff --git a/packages/react-native/React/Views/RCTModalHostViewManager.h b/packages/react-native/React/Views/RCTModalHostViewManager.h index d2694ea26fd..9e4806615a5 100644 --- a/packages/react-native/React/Views/RCTModalHostViewManager.h +++ b/packages/react-native/React/Views/RCTModalHostViewManager.h @@ -9,6 +9,8 @@ #import #import +#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 diff --git a/packages/react-native/React/Views/RCTModalHostViewManager.m b/packages/react-native/React/Views/RCTModalHostViewManager.m index 203d0b44134..39a334f429f 100644 --- a/packages/react-native/React/Views/RCTModalHostViewManager.m +++ b/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 diff --git a/packages/react-native/React/Views/RCTModalManager.h b/packages/react-native/React/Views/RCTModalManager.h index 237037fd8db..3ff4b6a081c 100644 --- a/packages/react-native/React/Views/RCTModalManager.h +++ b/packages/react-native/React/Views/RCTModalManager.h @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import @@ -15,3 +17,5 @@ - (void)modalDismissed:(NSNumber *)modalID; @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/React/Views/RCTModalManager.m b/packages/react-native/React/Views/RCTModalManager.m index 85ddb29b149..e069d63d10d 100644 --- a/packages/react-native/React/Views/RCTModalManager.m +++ b/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 diff --git a/packages/react-native/React/Views/RCTRootShadowView.m b/packages/react-native/React/Views/RCTRootShadowView.m index b80ab28ba85..9cb10ddd33a 100644 --- a/packages/react-native/React/Views/RCTRootShadowView.m +++ b/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 diff --git a/packages/react-native/React/Views/RCTShadowView.m b/packages/react-native/React/Views/RCTShadowView.m index 3d7cb7a1d9e..8e24d48ade1 100644 --- a/packages/react-native/React/Views/RCTShadowView.m +++ b/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 *)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 *)changedProps +{ +} + +- (CGRect)measureLayoutRelativeToAncestor:(RCTShadowView *)ancestor +{ + return CGRectNull; +} + +- (BOOL)viewIsDescendantOf:(RCTShadowView *)ancestor +{ + return NO; +} + +@end +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/React/Views/RCTSwitch.h b/packages/react-native/React/Views/RCTSwitch.h index dfbc7a0b32e..b92d57e5ca5 100644 --- a/packages/react-native/React/Views/RCTSwitch.h +++ b/packages/react-native/React/Views/RCTSwitch.h @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import @interface RCTSwitch : UISwitch @@ -15,3 +17,5 @@ @property (nonatomic, copy) RCTBubblingEventBlock onChange; @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/React/Views/RCTSwitch.m b/packages/react-native/React/Views/RCTSwitch.m index 0cce9e18035..9a7208886f4 100644 --- a/packages/react-native/React/Views/RCTSwitch.m +++ b/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 diff --git a/packages/react-native/React/Views/RCTSwitchManager.h b/packages/react-native/React/Views/RCTSwitchManager.h index 8e1fc5d4797..eada0a5d08f 100644 --- a/packages/react-native/React/Views/RCTSwitchManager.h +++ b/packages/react-native/React/Views/RCTSwitchManager.h @@ -7,6 +7,10 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + @interface RCTSwitchManager : RCTViewManager @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/React/Views/RCTSwitchManager.m b/packages/react-native/React/Views/RCTSwitchManager.m index b04b51f844e..db5c38f9127 100644 --- a/packages/react-native/React/Views/RCTSwitchManager.m +++ b/packages/react-native/React/Views/RCTSwitchManager.m @@ -7,6 +7,8 @@ #import "RCTSwitchManager.h" +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #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 diff --git a/packages/react-native/React/Views/RefreshControl/RCTRefreshControl.h b/packages/react-native/React/Views/RefreshControl/RCTRefreshControl.h index e9b330fa7c2..87423cbcca0 100644 --- a/packages/react-native/React/Views/RefreshControl/RCTRefreshControl.h +++ b/packages/react-native/React/Views/RefreshControl/RCTRefreshControl.h @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import @@ -17,3 +19,5 @@ @property (nonatomic, weak) UIScrollView *scrollView; @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/React/Views/RefreshControl/RCTRefreshControl.m b/packages/react-native/React/Views/RefreshControl/RCTRefreshControl.m index 7f7e5471ec6..7cb52d053f9 100644 --- a/packages/react-native/React/Views/RefreshControl/RCTRefreshControl.m +++ b/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 () @@ -224,3 +226,5 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder) } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/React/Views/RefreshControl/RCTRefreshControlManager.h b/packages/react-native/React/Views/RefreshControl/RCTRefreshControlManager.h index 123af7426c1..6b4dfe90231 100644 --- a/packages/react-native/React/Views/RefreshControl/RCTRefreshControlManager.h +++ b/packages/react-native/React/Views/RefreshControl/RCTRefreshControlManager.h @@ -7,6 +7,10 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + @interface RCTRefreshControlManager : RCTViewManager @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/React/Views/RefreshControl/RCTRefreshControlManager.m b/packages/react-native/React/Views/RefreshControl/RCTRefreshControlManager.m index 40aaf9c51eb..dc2cd99fc52 100644 --- a/packages/react-native/React/Views/RefreshControl/RCTRefreshControlManager.m +++ b/packages/react-native/React/Views/RefreshControl/RCTRefreshControlManager.m @@ -7,6 +7,8 @@ #import +#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 diff --git a/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaShadowView.h b/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaShadowView.h index 5a5caaaefb7..38f3067dbbe 100644 --- a/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaShadowView.h +++ b/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaShadowView.h @@ -7,6 +7,8 @@ #import +#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 diff --git a/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaShadowView.m b/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaShadowView.m index 9b7dbf34d10..40469597526 100644 --- a/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaShadowView.m +++ b/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaShadowView.m @@ -7,6 +7,8 @@ #import "RCTSafeAreaShadowView.h" +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import @@ -51,3 +53,5 @@ } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaView.h b/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaView.h index 4817b68d527..411a57a3ba9 100644 --- a/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaView.h +++ b/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaView.h @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import NS_ASSUME_NONNULL_BEGIN @@ -20,3 +22,5 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaView.m b/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaView.m index eeb12da71bf..c55a7a8cbca 100644 --- a/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaView.m +++ b/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaView.m @@ -7,6 +7,8 @@ #import "RCTSafeAreaView.h" +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import @@ -73,3 +75,5 @@ static BOOL UIEdgeInsetsEqualToEdgeInsetsWithThreshold(UIEdgeInsets insets1, UIE } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.h b/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.h index b78edb76c35..c5ea18bfe31 100644 --- a/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.h +++ b/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.h @@ -7,6 +7,8 @@ #import +#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 diff --git a/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.m b/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.m index 76c3558b27a..ff786b3f21e 100644 --- a/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaViewLocalData.m +++ b/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 diff --git a/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaViewManager.h b/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaViewManager.h index 4572832c849..2b5d8e6b7d7 100644 --- a/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaViewManager.h +++ b/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaViewManager.h @@ -7,6 +7,8 @@ #import +#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 diff --git a/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaViewManager.m b/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaViewManager.m index 284500455da..c36bf90b9a2 100644 --- a/packages/react-native/React/Views/SafeAreaView/RCTSafeAreaViewManager.m +++ b/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 diff --git a/packages/react-native/React/Views/ScrollView/RCTScrollContentShadowView.h b/packages/react-native/React/Views/ScrollView/RCTScrollContentShadowView.h index 126a57586b6..7f04bc72989 100644 --- a/packages/react-native/React/Views/ScrollView/RCTScrollContentShadowView.h +++ b/packages/react-native/React/Views/ScrollView/RCTScrollContentShadowView.h @@ -7,8 +7,12 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import @interface RCTScrollContentShadowView : RCTShadowView @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/React/Views/ScrollView/RCTScrollContentShadowView.m b/packages/react-native/React/Views/ScrollView/RCTScrollContentShadowView.m index c892556c6aa..76f75bd3b06 100644 --- a/packages/react-native/React/Views/ScrollView/RCTScrollContentShadowView.m +++ b/packages/react-native/React/Views/ScrollView/RCTScrollContentShadowView.m @@ -7,6 +7,8 @@ #import "RCTScrollContentShadowView.h" +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import "RCTUtils.h" @@ -29,3 +31,5 @@ } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/React/Views/ScrollView/RCTScrollContentView.h b/packages/react-native/React/Views/ScrollView/RCTScrollContentView.h index 853a76b647c..aaec3406f75 100644 --- a/packages/react-native/React/Views/ScrollView/RCTScrollContentView.h +++ b/packages/react-native/React/Views/ScrollView/RCTScrollContentView.h @@ -7,8 +7,12 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import @interface RCTScrollContentView : RCTView @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/React/Views/ScrollView/RCTScrollContentView.m b/packages/react-native/React/Views/ScrollView/RCTScrollContentView.m index 08fcd52c499..dca370a3a76 100644 --- a/packages/react-native/React/Views/ScrollView/RCTScrollContentView.m +++ b/packages/react-native/React/Views/ScrollView/RCTScrollContentView.m @@ -7,6 +7,8 @@ #import "RCTScrollContentView.h" +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import @@ -30,3 +32,5 @@ } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/React/Views/ScrollView/RCTScrollContentViewManager.h b/packages/react-native/React/Views/ScrollView/RCTScrollContentViewManager.h index 9b5dbbfe51b..1546f5eb11d 100644 --- a/packages/react-native/React/Views/ScrollView/RCTScrollContentViewManager.h +++ b/packages/react-native/React/Views/ScrollView/RCTScrollContentViewManager.h @@ -7,6 +7,10 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + @interface RCTScrollContentViewManager : RCTViewManager @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/React/Views/ScrollView/RCTScrollContentViewManager.m b/packages/react-native/React/Views/ScrollView/RCTScrollContentViewManager.m index 5ebbddf30cc..4bf8216ec72 100644 --- a/packages/react-native/React/Views/ScrollView/RCTScrollContentViewManager.m +++ b/packages/react-native/React/Views/ScrollView/RCTScrollContentViewManager.m @@ -7,6 +7,8 @@ #import "RCTScrollContentViewManager.h" +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import "RCTScrollContentShadowView.h" #import "RCTScrollContentView.h" @@ -25,3 +27,5 @@ RCT_EXPORT_MODULE() } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/React/Views/ScrollView/RCTScrollView.h b/packages/react-native/React/Views/ScrollView/RCTScrollView.h index 10ef46a513e..6bb74ebfae5 100644 --- a/packages/react-native/React/Views/ScrollView/RCTScrollView.h +++ b/packages/react-native/React/Views/ScrollView/RCTScrollView.h @@ -7,6 +7,8 @@ #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import #import @@ -78,3 +80,5 @@ @end RCT_EXTERN void RCTSendFakeScrollEvent(id eventDispatcher, NSNumber *reactTag); + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/React/Views/ScrollView/RCTScrollView.m b/packages/react-native/React/Views/ScrollView/RCTScrollView.m index 59f956d893e..f31e452e93c 100644 --- a/packages/react-native/React/Views/ScrollView/RCTScrollView.m +++ b/packages/react-native/React/Views/ScrollView/RCTScrollView.m @@ -7,6 +7,8 @@ #import "RCTScrollView.h" +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import #import "RCTConvert.h" @@ -1163,3 +1165,5 @@ void RCTSendFakeScrollEvent(id eventDispatcher, NSNu coalescingKey:0]; [eventDispatcher sendEvent:fakeScrollEvent]; } + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/React/Views/ScrollView/RCTScrollViewManager.h b/packages/react-native/React/Views/ScrollView/RCTScrollViewManager.h index 3709180eb41..6e0ec15bda5 100644 --- a/packages/react-native/React/Views/ScrollView/RCTScrollViewManager.h +++ b/packages/react-native/React/Views/ScrollView/RCTScrollViewManager.h @@ -8,6 +8,8 @@ #import #import +#ifndef RCT_FIT_RM_OLD_COMPONENT + @interface RCTConvert (UIScrollView) + (UIScrollViewKeyboardDismissMode)UIScrollViewKeyboardDismissMode:(id)json; @@ -17,3 +19,5 @@ @interface RCTScrollViewManager : RCTViewManager @end + +#endif // RCT_FIT_RM_OLD_COMPONENT diff --git a/packages/react-native/React/Views/ScrollView/RCTScrollViewManager.m b/packages/react-native/React/Views/ScrollView/RCTScrollViewManager.m index c1d017203fa..8cf926fc736 100644 --- a/packages/react-native/React/Views/ScrollView/RCTScrollViewManager.m +++ b/packages/react-native/React/Views/ScrollView/RCTScrollViewManager.m @@ -7,6 +7,8 @@ #import "RCTScrollViewManager.h" +#ifndef RCT_FIT_RM_OLD_COMPONENT + #import "RCTBridge.h" #import "RCTScrollView.h" #import "RCTShadowView.h" @@ -199,3 +201,5 @@ RCT_EXPORT_METHOD(flashScrollIndicators : (nonnull NSNumber *)reactTag) } @end + +#endif // RCT_FIT_RM_OLD_COMPONENT