From 76345415cc30aff45af6bcbf49fa2919354c2be0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Norte?= Date: Thu, 2 Jul 2026 06:27:04 -0700 Subject: [PATCH] Colocate deprecated native component specs with their components Summary: Moves the native component specs out of the legacy `specs_DEPRECATED/components` directory and into a `specs/` folder colocated with the component they belong to, under `src/private/components//specs/`. The directory name for each component is its public name, lowercased and without spaces (e.g. `DrawerLayoutAndroid` -> `drawerlayoutandroid`, `RefreshControl` -> `refreshcontrol`). This continues the effort described in the `specs_DEPRECATED` README of gradually moving specs out of that directory until it can be removed. Specs shared by the same public component are grouped together (e.g. `AndroidSwitchNativeComponent` and `SwitchNativeComponent` under `switch/specs`, `AndroidSwipeRefreshLayoutNativeComponent` and `PullToRefreshViewNativeComponent` under `refreshcontrol/specs`). Relative imports inside each moved spec were updated for the new depth, and every consumer (the re-export shims under `Libraries` plus the colocated `scrollview` and `safeareaview` consumers) now points at the new location. Public import paths are unchanged because the `Libraries` re-export shims are preserved. Codegen still discovers the specs since it scans the whole `src` directory. Changelog: [Internal] Differential Revision: D110472967 --- .../ActivityIndicatorViewNativeComponent.js | 4 ++-- .../AndroidDrawerLayoutNativeComponent.js | 4 ++-- .../ProgressBarAndroidNativeComponent.js | 4 ++-- .../AndroidSwipeRefreshLayoutNativeComponent.js | 4 ++-- .../PullToRefreshViewNativeComponent.js | 4 ++-- .../SafeAreaView/RCTSafeAreaViewNativeComponent.js | 4 ++-- ...roidHorizontalScrollContentViewNativeComponent.js | 4 ++-- .../Switch/AndroidSwitchNativeComponent.js | 4 ++-- .../Components/Switch/SwitchNativeComponent.js | 4 ++-- .../RCTInputAccessoryViewNativeComponent.js | 4 ++-- .../UnimplementedNativeViewNativeComponent.js | 4 ++-- .../Libraries/Debugging/DebuggingOverlay.js | 4 ++-- .../Debugging/DebuggingOverlayNativeComponent.js | 4 ++-- .../Modal/RCTModalHostViewNativeComponent.js | 4 ++-- .../specs}/ActivityIndicatorViewNativeComponent.js | 10 +++++----- .../specs}/DebuggingOverlayNativeComponent.js | 10 +++++----- .../specs}/AndroidDrawerLayoutNativeComponent.js | 12 ++++++------ .../specs}/RCTInputAccessoryViewNativeComponent.js | 8 ++++---- .../modal/specs}/RCTModalHostViewNativeComponent.js | 8 ++++---- .../specs}/ProgressBarAndroidNativeComponent.js | 10 +++++----- .../AndroidSwipeRefreshLayoutNativeComponent.js | 12 ++++++------ .../specs}/PullToRefreshViewNativeComponent.js | 12 ++++++------ .../safeareaview/SafeAreaView_INTERNAL_DO_NOT_USE.js | 4 ++-- .../specs}/RCTSafeAreaViewNativeComponent.js | 6 +++--- .../scrollview/HScrollViewNativeComponents.js | 2 +- ...roidHorizontalScrollContentViewNativeComponent.js | 6 +++--- .../switch/specs}/AndroidSwitchNativeComponent.js | 12 ++++++------ .../switch/specs}/SwitchNativeComponent.js | 12 ++++++------ .../specs}/UnimplementedNativeViewNativeComponent.js | 8 ++++---- 29 files changed, 94 insertions(+), 94 deletions(-) rename packages/react-native/src/private/{specs_DEPRECATED/components => components/activityindicator/specs}/ActivityIndicatorViewNativeComponent.js (76%) rename packages/react-native/src/private/{specs_DEPRECATED/components => components/debuggingoverlay/specs}/DebuggingOverlayNativeComponent.js (76%) rename packages/react-native/src/private/{specs_DEPRECATED/components => components/drawerlayoutandroid/specs}/AndroidDrawerLayoutNativeComponent.js (88%) rename packages/react-native/src/private/{specs_DEPRECATED/components => components/inputaccessoryview/specs}/RCTInputAccessoryViewNativeComponent.js (63%) rename packages/react-native/src/private/{specs_DEPRECATED/components => components/modal/specs}/RCTModalHostViewNativeComponent.js (93%) rename packages/react-native/src/private/{specs_DEPRECATED/components => components/progressbarandroid/specs}/ProgressBarAndroidNativeComponent.js (65%) rename packages/react-native/src/private/{specs_DEPRECATED/components => components/refreshcontrol/specs}/AndroidSwipeRefreshLayoutNativeComponent.js (77%) rename packages/react-native/src/private/{specs_DEPRECATED/components => components/refreshcontrol/specs}/PullToRefreshViewNativeComponent.js (75%) rename packages/react-native/src/private/{specs_DEPRECATED/components => components/safeareaview/specs}/RCTSafeAreaViewNativeComponent.js (67%) rename packages/react-native/src/private/{specs_DEPRECATED/components => components/scrollview/specs}/AndroidHorizontalScrollContentViewNativeComponent.js (70%) rename packages/react-native/src/private/{specs_DEPRECATED/components => components/switch/specs}/AndroidSwitchNativeComponent.js (73%) rename packages/react-native/src/private/{specs_DEPRECATED/components => components/switch/specs}/SwitchNativeComponent.js (73%) rename packages/react-native/src/private/{specs_DEPRECATED/components => components/unimplementedview/specs}/UnimplementedNativeViewNativeComponent.js (64%) diff --git a/packages/react-native/Libraries/Components/ActivityIndicator/ActivityIndicatorViewNativeComponent.js b/packages/react-native/Libraries/Components/ActivityIndicator/ActivityIndicatorViewNativeComponent.js index c38b088737b0..5c8b8c8810bc 100644 --- a/packages/react-native/Libraries/Components/ActivityIndicator/ActivityIndicatorViewNativeComponent.js +++ b/packages/react-native/Libraries/Components/ActivityIndicator/ActivityIndicatorViewNativeComponent.js @@ -8,5 +8,5 @@ * @format */ -export * from '../../../src/private/specs_DEPRECATED/components/ActivityIndicatorViewNativeComponent'; -export {default} from '../../../src/private/specs_DEPRECATED/components/ActivityIndicatorViewNativeComponent'; +export * from '../../../src/private/components/activityindicator/specs/ActivityIndicatorViewNativeComponent'; +export {default} from '../../../src/private/components/activityindicator/specs/ActivityIndicatorViewNativeComponent'; diff --git a/packages/react-native/Libraries/Components/DrawerAndroid/AndroidDrawerLayoutNativeComponent.js b/packages/react-native/Libraries/Components/DrawerAndroid/AndroidDrawerLayoutNativeComponent.js index 738baaeeb412..ef8761290310 100644 --- a/packages/react-native/Libraries/Components/DrawerAndroid/AndroidDrawerLayoutNativeComponent.js +++ b/packages/react-native/Libraries/Components/DrawerAndroid/AndroidDrawerLayoutNativeComponent.js @@ -8,5 +8,5 @@ * @format */ -export * from '../../../src/private/specs_DEPRECATED/components/AndroidDrawerLayoutNativeComponent'; -export {default} from '../../../src/private/specs_DEPRECATED/components/AndroidDrawerLayoutNativeComponent'; +export * from '../../../src/private/components/drawerlayoutandroid/specs/AndroidDrawerLayoutNativeComponent'; +export {default} from '../../../src/private/components/drawerlayoutandroid/specs/AndroidDrawerLayoutNativeComponent'; diff --git a/packages/react-native/Libraries/Components/ProgressBarAndroid/ProgressBarAndroidNativeComponent.js b/packages/react-native/Libraries/Components/ProgressBarAndroid/ProgressBarAndroidNativeComponent.js index c8a0c9dc0fb5..66ab5d347d3a 100644 --- a/packages/react-native/Libraries/Components/ProgressBarAndroid/ProgressBarAndroidNativeComponent.js +++ b/packages/react-native/Libraries/Components/ProgressBarAndroid/ProgressBarAndroidNativeComponent.js @@ -8,5 +8,5 @@ * @format */ -export * from '../../../src/private/specs_DEPRECATED/components/ProgressBarAndroidNativeComponent'; -export {default} from '../../../src/private/specs_DEPRECATED/components/ProgressBarAndroidNativeComponent'; +export * from '../../../src/private/components/progressbarandroid/specs/ProgressBarAndroidNativeComponent'; +export {default} from '../../../src/private/components/progressbarandroid/specs/ProgressBarAndroidNativeComponent'; diff --git a/packages/react-native/Libraries/Components/RefreshControl/AndroidSwipeRefreshLayoutNativeComponent.js b/packages/react-native/Libraries/Components/RefreshControl/AndroidSwipeRefreshLayoutNativeComponent.js index ae85369dfe1c..415177a45bbb 100644 --- a/packages/react-native/Libraries/Components/RefreshControl/AndroidSwipeRefreshLayoutNativeComponent.js +++ b/packages/react-native/Libraries/Components/RefreshControl/AndroidSwipeRefreshLayoutNativeComponent.js @@ -8,5 +8,5 @@ * @format */ -export * from '../../../src/private/specs_DEPRECATED/components/AndroidSwipeRefreshLayoutNativeComponent'; -export {default} from '../../../src/private/specs_DEPRECATED/components/AndroidSwipeRefreshLayoutNativeComponent'; +export * from '../../../src/private/components/refreshcontrol/specs/AndroidSwipeRefreshLayoutNativeComponent'; +export {default} from '../../../src/private/components/refreshcontrol/specs/AndroidSwipeRefreshLayoutNativeComponent'; diff --git a/packages/react-native/Libraries/Components/RefreshControl/PullToRefreshViewNativeComponent.js b/packages/react-native/Libraries/Components/RefreshControl/PullToRefreshViewNativeComponent.js index 8dfc8b4be86b..ef9c7992bfd3 100644 --- a/packages/react-native/Libraries/Components/RefreshControl/PullToRefreshViewNativeComponent.js +++ b/packages/react-native/Libraries/Components/RefreshControl/PullToRefreshViewNativeComponent.js @@ -8,7 +8,7 @@ * @format */ -export * from '../../../src/private/specs_DEPRECATED/components/PullToRefreshViewNativeComponent'; -import PullToRefreshViewNativeComponent from '../../../src/private/specs_DEPRECATED/components/PullToRefreshViewNativeComponent'; +export * from '../../../src/private/components/refreshcontrol/specs/PullToRefreshViewNativeComponent'; +import PullToRefreshViewNativeComponent from '../../../src/private/components/refreshcontrol/specs/PullToRefreshViewNativeComponent'; export default PullToRefreshViewNativeComponent; diff --git a/packages/react-native/Libraries/Components/SafeAreaView/RCTSafeAreaViewNativeComponent.js b/packages/react-native/Libraries/Components/SafeAreaView/RCTSafeAreaViewNativeComponent.js index d5167277bf5a..feb40f24ecef 100644 --- a/packages/react-native/Libraries/Components/SafeAreaView/RCTSafeAreaViewNativeComponent.js +++ b/packages/react-native/Libraries/Components/SafeAreaView/RCTSafeAreaViewNativeComponent.js @@ -8,5 +8,5 @@ * @format */ -export * from '../../../src/private/specs_DEPRECATED/components/RCTSafeAreaViewNativeComponent'; -export {default} from '../../../src/private/specs_DEPRECATED/components/RCTSafeAreaViewNativeComponent'; +export * from '../../../src/private/components/safeareaview/specs/RCTSafeAreaViewNativeComponent'; +export {default} from '../../../src/private/components/safeareaview/specs/RCTSafeAreaViewNativeComponent'; diff --git a/packages/react-native/Libraries/Components/ScrollView/AndroidHorizontalScrollContentViewNativeComponent.js b/packages/react-native/Libraries/Components/ScrollView/AndroidHorizontalScrollContentViewNativeComponent.js index c3444b748b2d..cd71ac064fcd 100644 --- a/packages/react-native/Libraries/Components/ScrollView/AndroidHorizontalScrollContentViewNativeComponent.js +++ b/packages/react-native/Libraries/Components/ScrollView/AndroidHorizontalScrollContentViewNativeComponent.js @@ -8,5 +8,5 @@ * @format */ -export * from '../../../src/private/specs_DEPRECATED/components/AndroidHorizontalScrollContentViewNativeComponent'; -export {default} from '../../../src/private/specs_DEPRECATED/components/AndroidHorizontalScrollContentViewNativeComponent'; +export * from '../../../src/private/components/scrollview/specs/AndroidHorizontalScrollContentViewNativeComponent'; +export {default} from '../../../src/private/components/scrollview/specs/AndroidHorizontalScrollContentViewNativeComponent'; diff --git a/packages/react-native/Libraries/Components/Switch/AndroidSwitchNativeComponent.js b/packages/react-native/Libraries/Components/Switch/AndroidSwitchNativeComponent.js index d35caee50989..cdb603c04938 100644 --- a/packages/react-native/Libraries/Components/Switch/AndroidSwitchNativeComponent.js +++ b/packages/react-native/Libraries/Components/Switch/AndroidSwitchNativeComponent.js @@ -8,5 +8,5 @@ * @format */ -export * from '../../../src/private/specs_DEPRECATED/components/AndroidSwitchNativeComponent'; -export {default} from '../../../src/private/specs_DEPRECATED/components/AndroidSwitchNativeComponent'; +export * from '../../../src/private/components/switch/specs/AndroidSwitchNativeComponent'; +export {default} from '../../../src/private/components/switch/specs/AndroidSwitchNativeComponent'; diff --git a/packages/react-native/Libraries/Components/Switch/SwitchNativeComponent.js b/packages/react-native/Libraries/Components/Switch/SwitchNativeComponent.js index 30e1c3b41af0..4459f0a433ac 100644 --- a/packages/react-native/Libraries/Components/Switch/SwitchNativeComponent.js +++ b/packages/react-native/Libraries/Components/Switch/SwitchNativeComponent.js @@ -8,5 +8,5 @@ * @format */ -export * from '../../../src/private/specs_DEPRECATED/components/SwitchNativeComponent'; -export {default} from '../../../src/private/specs_DEPRECATED/components/SwitchNativeComponent'; +export * from '../../../src/private/components/switch/specs/SwitchNativeComponent'; +export {default} from '../../../src/private/components/switch/specs/SwitchNativeComponent'; diff --git a/packages/react-native/Libraries/Components/TextInput/RCTInputAccessoryViewNativeComponent.js b/packages/react-native/Libraries/Components/TextInput/RCTInputAccessoryViewNativeComponent.js index f6671165d4a2..2db1c367fcca 100644 --- a/packages/react-native/Libraries/Components/TextInput/RCTInputAccessoryViewNativeComponent.js +++ b/packages/react-native/Libraries/Components/TextInput/RCTInputAccessoryViewNativeComponent.js @@ -8,5 +8,5 @@ * @format */ -export * from '../../../src/private/specs_DEPRECATED/components/RCTInputAccessoryViewNativeComponent'; -export {default} from '../../../src/private/specs_DEPRECATED/components/RCTInputAccessoryViewNativeComponent'; +export * from '../../../src/private/components/inputaccessoryview/specs/RCTInputAccessoryViewNativeComponent'; +export {default} from '../../../src/private/components/inputaccessoryview/specs/RCTInputAccessoryViewNativeComponent'; diff --git a/packages/react-native/Libraries/Components/UnimplementedViews/UnimplementedNativeViewNativeComponent.js b/packages/react-native/Libraries/Components/UnimplementedViews/UnimplementedNativeViewNativeComponent.js index 7fc000cfdbdb..21f15f6acd39 100644 --- a/packages/react-native/Libraries/Components/UnimplementedViews/UnimplementedNativeViewNativeComponent.js +++ b/packages/react-native/Libraries/Components/UnimplementedViews/UnimplementedNativeViewNativeComponent.js @@ -8,5 +8,5 @@ * @format */ -export * from '../../../src/private/specs_DEPRECATED/components/UnimplementedNativeViewNativeComponent'; -export {default} from '../../../src/private/specs_DEPRECATED/components/UnimplementedNativeViewNativeComponent'; +export * from '../../../src/private/components/unimplementedview/specs/UnimplementedNativeViewNativeComponent'; +export {default} from '../../../src/private/components/unimplementedview/specs/UnimplementedNativeViewNativeComponent'; diff --git a/packages/react-native/Libraries/Debugging/DebuggingOverlay.js b/packages/react-native/Libraries/Debugging/DebuggingOverlay.js index a66876579c13..ea1a3633d44e 100644 --- a/packages/react-native/Libraries/Debugging/DebuggingOverlay.js +++ b/packages/react-native/Libraries/Debugging/DebuggingOverlay.js @@ -11,11 +11,11 @@ import type { ElementRectangle, TraceUpdate, -} from '../../src/private/specs_DEPRECATED/components/DebuggingOverlayNativeComponent'; +} from '../../src/private/components/debuggingoverlay/specs/DebuggingOverlayNativeComponent'; import DebuggingOverlayNativeComponent, { Commands, -} from '../../src/private/specs_DEPRECATED/components/DebuggingOverlayNativeComponent'; +} from '../../src/private/components/debuggingoverlay/specs/DebuggingOverlayNativeComponent'; import View from '../Components/View/View'; import UIManager from '../ReactNative/UIManager'; import StyleSheet from '../StyleSheet/StyleSheet'; diff --git a/packages/react-native/Libraries/Debugging/DebuggingOverlayNativeComponent.js b/packages/react-native/Libraries/Debugging/DebuggingOverlayNativeComponent.js index d2caa647bc4d..0aa7cb248181 100644 --- a/packages/react-native/Libraries/Debugging/DebuggingOverlayNativeComponent.js +++ b/packages/react-native/Libraries/Debugging/DebuggingOverlayNativeComponent.js @@ -8,7 +8,7 @@ * @format */ -export * from '../../src/private/specs_DEPRECATED/components/DebuggingOverlayNativeComponent'; -import DebuggingOverlayNativeComponent from '../../src/private/specs_DEPRECATED/components/DebuggingOverlayNativeComponent'; +export * from '../../src/private/components/debuggingoverlay/specs/DebuggingOverlayNativeComponent'; +import DebuggingOverlayNativeComponent from '../../src/private/components/debuggingoverlay/specs/DebuggingOverlayNativeComponent'; export default DebuggingOverlayNativeComponent; diff --git a/packages/react-native/Libraries/Modal/RCTModalHostViewNativeComponent.js b/packages/react-native/Libraries/Modal/RCTModalHostViewNativeComponent.js index 5adaf223364a..69cf74fb3b4c 100644 --- a/packages/react-native/Libraries/Modal/RCTModalHostViewNativeComponent.js +++ b/packages/react-native/Libraries/Modal/RCTModalHostViewNativeComponent.js @@ -8,7 +8,7 @@ * @format */ -export * from '../../src/private/specs_DEPRECATED/components/RCTModalHostViewNativeComponent'; -import RCTModalHostViewNativeComponent from '../../src/private/specs_DEPRECATED/components/RCTModalHostViewNativeComponent'; +export * from '../../src/private/components/modal/specs/RCTModalHostViewNativeComponent'; +import RCTModalHostViewNativeComponent from '../../src/private/components/modal/specs/RCTModalHostViewNativeComponent'; export default RCTModalHostViewNativeComponent; diff --git a/packages/react-native/src/private/specs_DEPRECATED/components/ActivityIndicatorViewNativeComponent.js b/packages/react-native/src/private/components/activityindicator/specs/ActivityIndicatorViewNativeComponent.js similarity index 76% rename from packages/react-native/src/private/specs_DEPRECATED/components/ActivityIndicatorViewNativeComponent.js rename to packages/react-native/src/private/components/activityindicator/specs/ActivityIndicatorViewNativeComponent.js index 123a768622d2..fc26971a8c8d 100644 --- a/packages/react-native/src/private/specs_DEPRECATED/components/ActivityIndicatorViewNativeComponent.js +++ b/packages/react-native/src/private/components/activityindicator/specs/ActivityIndicatorViewNativeComponent.js @@ -8,12 +8,12 @@ * @format */ -import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes'; -import type {ColorValue} from '../../../../Libraries/StyleSheet/StyleSheet'; -import type {WithDefault} from '../../../../Libraries/Types/CodegenTypes'; -import type {HostComponent} from '../../types/HostComponent'; +import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; +import type {ColorValue} from '../../../../../Libraries/StyleSheet/StyleSheet'; +import type {WithDefault} from '../../../../../Libraries/Types/CodegenTypes'; +import type {HostComponent} from '../../../types/HostComponent'; -import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent'; +import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; type RCTActivityIndicatorViewNativeProps = Readonly<{ ...ViewProps, diff --git a/packages/react-native/src/private/specs_DEPRECATED/components/DebuggingOverlayNativeComponent.js b/packages/react-native/src/private/components/debuggingoverlay/specs/DebuggingOverlayNativeComponent.js similarity index 76% rename from packages/react-native/src/private/specs_DEPRECATED/components/DebuggingOverlayNativeComponent.js rename to packages/react-native/src/private/components/debuggingoverlay/specs/DebuggingOverlayNativeComponent.js index be635142f431..f8528c18c450 100644 --- a/packages/react-native/src/private/specs_DEPRECATED/components/DebuggingOverlayNativeComponent.js +++ b/packages/react-native/src/private/components/debuggingoverlay/specs/DebuggingOverlayNativeComponent.js @@ -8,12 +8,12 @@ * @format */ -import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes'; -import type {ProcessedColorValue} from '../../../../Libraries/StyleSheet/processColor'; -import type {HostComponent} from '../../types/HostComponent'; +import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; +import type {ProcessedColorValue} from '../../../../../Libraries/StyleSheet/processColor'; +import type {HostComponent} from '../../../types/HostComponent'; -import codegenNativeCommands from '../../../../Libraries/Utilities/codegenNativeCommands'; -import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent'; +import codegenNativeCommands from '../../../../../Libraries/Utilities/codegenNativeCommands'; +import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; import * as React from 'react'; type DebuggingOverlayNativeProps = Readonly<{ diff --git a/packages/react-native/src/private/specs_DEPRECATED/components/AndroidDrawerLayoutNativeComponent.js b/packages/react-native/src/private/components/drawerlayoutandroid/specs/AndroidDrawerLayoutNativeComponent.js similarity index 88% rename from packages/react-native/src/private/specs_DEPRECATED/components/AndroidDrawerLayoutNativeComponent.js rename to packages/react-native/src/private/components/drawerlayoutandroid/specs/AndroidDrawerLayoutNativeComponent.js index dc0f3eae0940..47063579c32a 100644 --- a/packages/react-native/src/private/specs_DEPRECATED/components/AndroidDrawerLayoutNativeComponent.js +++ b/packages/react-native/src/private/components/drawerlayoutandroid/specs/AndroidDrawerLayoutNativeComponent.js @@ -8,18 +8,18 @@ * @format */ -import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes'; -import type {ColorValue} from '../../../../Libraries/StyleSheet/StyleSheet'; +import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; +import type {ColorValue} from '../../../../../Libraries/StyleSheet/StyleSheet'; import type { DirectEventHandler, Float, Int32, WithDefault, -} from '../../../../Libraries/Types/CodegenTypes'; -import type {HostComponent} from '../../types/HostComponent'; +} from '../../../../../Libraries/Types/CodegenTypes'; +import type {HostComponent} from '../../../types/HostComponent'; -import codegenNativeCommands from '../../../../Libraries/Utilities/codegenNativeCommands'; -import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent'; +import codegenNativeCommands from '../../../../../Libraries/Utilities/codegenNativeCommands'; +import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; import * as React from 'react'; type DrawerStateEvent = Readonly<{ diff --git a/packages/react-native/src/private/specs_DEPRECATED/components/RCTInputAccessoryViewNativeComponent.js b/packages/react-native/src/private/components/inputaccessoryview/specs/RCTInputAccessoryViewNativeComponent.js similarity index 63% rename from packages/react-native/src/private/specs_DEPRECATED/components/RCTInputAccessoryViewNativeComponent.js rename to packages/react-native/src/private/components/inputaccessoryview/specs/RCTInputAccessoryViewNativeComponent.js index 66e1e025590f..b271cb6fef23 100644 --- a/packages/react-native/src/private/specs_DEPRECATED/components/RCTInputAccessoryViewNativeComponent.js +++ b/packages/react-native/src/private/components/inputaccessoryview/specs/RCTInputAccessoryViewNativeComponent.js @@ -8,11 +8,11 @@ * @format */ -import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes'; -import type {ColorValue} from '../../../../Libraries/StyleSheet/StyleSheet'; -import type {HostComponent} from '../../types/HostComponent'; +import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; +import type {ColorValue} from '../../../../../Libraries/StyleSheet/StyleSheet'; +import type {HostComponent} from '../../../types/HostComponent'; -import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent'; +import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; type InputAccessoryNativeProps = Readonly<{ ...ViewProps, diff --git a/packages/react-native/src/private/specs_DEPRECATED/components/RCTModalHostViewNativeComponent.js b/packages/react-native/src/private/components/modal/specs/RCTModalHostViewNativeComponent.js similarity index 93% rename from packages/react-native/src/private/specs_DEPRECATED/components/RCTModalHostViewNativeComponent.js rename to packages/react-native/src/private/components/modal/specs/RCTModalHostViewNativeComponent.js index d683103236a8..28e2ab7551bb 100644 --- a/packages/react-native/src/private/specs_DEPRECATED/components/RCTModalHostViewNativeComponent.js +++ b/packages/react-native/src/private/components/modal/specs/RCTModalHostViewNativeComponent.js @@ -8,15 +8,15 @@ * @format */ -import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes'; +import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; import type { DirectEventHandler, Int32, WithDefault, -} from '../../../../Libraries/Types/CodegenTypes'; -import type {HostComponent} from '../../types/HostComponent'; +} from '../../../../../Libraries/Types/CodegenTypes'; +import type {HostComponent} from '../../../types/HostComponent'; -import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent'; +import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; type OrientationChangeEvent = Readonly<{ orientation: 'portrait' | 'landscape', diff --git a/packages/react-native/src/private/specs_DEPRECATED/components/ProgressBarAndroidNativeComponent.js b/packages/react-native/src/private/components/progressbarandroid/specs/ProgressBarAndroidNativeComponent.js similarity index 65% rename from packages/react-native/src/private/specs_DEPRECATED/components/ProgressBarAndroidNativeComponent.js rename to packages/react-native/src/private/components/progressbarandroid/specs/ProgressBarAndroidNativeComponent.js index 2e0b59cdeedd..b1f993d5f99c 100644 --- a/packages/react-native/src/private/specs_DEPRECATED/components/ProgressBarAndroidNativeComponent.js +++ b/packages/react-native/src/private/components/progressbarandroid/specs/ProgressBarAndroidNativeComponent.js @@ -8,15 +8,15 @@ * @format */ -import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes'; -import type {ColorValue} from '../../../../Libraries/StyleSheet/StyleSheet'; +import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; +import type {ColorValue} from '../../../../../Libraries/StyleSheet/StyleSheet'; import type { Double, WithDefault, -} from '../../../../Libraries/Types/CodegenTypes'; -import type {HostComponent} from '../../types/HostComponent'; +} from '../../../../../Libraries/Types/CodegenTypes'; +import type {HostComponent} from '../../../types/HostComponent'; -import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent'; +import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; type AndroidProgressBarNativeProps = Readonly<{ ...ViewProps, diff --git a/packages/react-native/src/private/specs_DEPRECATED/components/AndroidSwipeRefreshLayoutNativeComponent.js b/packages/react-native/src/private/components/refreshcontrol/specs/AndroidSwipeRefreshLayoutNativeComponent.js similarity index 77% rename from packages/react-native/src/private/specs_DEPRECATED/components/AndroidSwipeRefreshLayoutNativeComponent.js rename to packages/react-native/src/private/components/refreshcontrol/specs/AndroidSwipeRefreshLayoutNativeComponent.js index da6309cc1f0a..0ab5738c12a4 100644 --- a/packages/react-native/src/private/specs_DEPRECATED/components/AndroidSwipeRefreshLayoutNativeComponent.js +++ b/packages/react-native/src/private/components/refreshcontrol/specs/AndroidSwipeRefreshLayoutNativeComponent.js @@ -8,17 +8,17 @@ * @format */ -import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes'; -import type {ColorValue} from '../../../../Libraries/StyleSheet/StyleSheet'; +import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; +import type {ColorValue} from '../../../../../Libraries/StyleSheet/StyleSheet'; import type { DirectEventHandler, Float, WithDefault, -} from '../../../../Libraries/Types/CodegenTypes'; -import type {HostComponent} from '../../types/HostComponent'; +} from '../../../../../Libraries/Types/CodegenTypes'; +import type {HostComponent} from '../../../types/HostComponent'; -import codegenNativeCommands from '../../../../Libraries/Utilities/codegenNativeCommands'; -import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent'; +import codegenNativeCommands from '../../../../../Libraries/Utilities/codegenNativeCommands'; +import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; import * as React from 'react'; type AndroidSwipeRefreshLayoutNativeProps = Readonly<{ diff --git a/packages/react-native/src/private/specs_DEPRECATED/components/PullToRefreshViewNativeComponent.js b/packages/react-native/src/private/components/refreshcontrol/specs/PullToRefreshViewNativeComponent.js similarity index 75% rename from packages/react-native/src/private/specs_DEPRECATED/components/PullToRefreshViewNativeComponent.js rename to packages/react-native/src/private/components/refreshcontrol/specs/PullToRefreshViewNativeComponent.js index 9024d7e34f29..1388be2faea9 100644 --- a/packages/react-native/src/private/specs_DEPRECATED/components/PullToRefreshViewNativeComponent.js +++ b/packages/react-native/src/private/components/refreshcontrol/specs/PullToRefreshViewNativeComponent.js @@ -8,17 +8,17 @@ * @format */ -import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes'; -import type {ColorValue} from '../../../../Libraries/StyleSheet/StyleSheet'; +import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; +import type {ColorValue} from '../../../../../Libraries/StyleSheet/StyleSheet'; import type { DirectEventHandler, Float, WithDefault, -} from '../../../../Libraries/Types/CodegenTypes'; -import type {HostComponent} from '../../types/HostComponent'; +} from '../../../../../Libraries/Types/CodegenTypes'; +import type {HostComponent} from '../../../types/HostComponent'; -import codegenNativeCommands from '../../../../Libraries/Utilities/codegenNativeCommands'; -import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent'; +import codegenNativeCommands from '../../../../../Libraries/Utilities/codegenNativeCommands'; +import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; import * as React from 'react'; type PullToRefreshNativeProps = Readonly<{ diff --git a/packages/react-native/src/private/components/safeareaview/SafeAreaView_INTERNAL_DO_NOT_USE.js b/packages/react-native/src/private/components/safeareaview/SafeAreaView_INTERNAL_DO_NOT_USE.js index 3bb3530a1617..e6b5cdd5f522 100644 --- a/packages/react-native/src/private/components/safeareaview/SafeAreaView_INTERNAL_DO_NOT_USE.js +++ b/packages/react-native/src/private/components/safeareaview/SafeAreaView_INTERNAL_DO_NOT_USE.js @@ -19,10 +19,10 @@ const exported: component( ref?: React.RefSetter>, ...ViewProps ) = Platform.select({ - ios: require('../../../../src/private/specs_DEPRECATED/components/RCTSafeAreaViewNativeComponent') + ios: require('../../../../src/private/components/safeareaview/specs/RCTSafeAreaViewNativeComponent') .default, android: UIManager.hasViewManagerConfig('RCTSafeAreaView') - ? require('../../../../src/private/specs_DEPRECATED/components/RCTSafeAreaViewNativeComponent') + ? require('../../../../src/private/components/safeareaview/specs/RCTSafeAreaViewNativeComponent') .default : View, default: View, diff --git a/packages/react-native/src/private/specs_DEPRECATED/components/RCTSafeAreaViewNativeComponent.js b/packages/react-native/src/private/components/safeareaview/specs/RCTSafeAreaViewNativeComponent.js similarity index 67% rename from packages/react-native/src/private/specs_DEPRECATED/components/RCTSafeAreaViewNativeComponent.js rename to packages/react-native/src/private/components/safeareaview/specs/RCTSafeAreaViewNativeComponent.js index 546f4fa6e425..444937011090 100644 --- a/packages/react-native/src/private/specs_DEPRECATED/components/RCTSafeAreaViewNativeComponent.js +++ b/packages/react-native/src/private/components/safeareaview/specs/RCTSafeAreaViewNativeComponent.js @@ -8,10 +8,10 @@ * @format */ -import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes'; -import type {HostComponent} from '../../types/HostComponent'; +import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; +import type {HostComponent} from '../../../types/HostComponent'; -import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent'; +import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; type RCTSafeAreaViewNativeProps = Readonly<{ ...ViewProps, diff --git a/packages/react-native/src/private/components/scrollview/HScrollViewNativeComponents.js b/packages/react-native/src/private/components/scrollview/HScrollViewNativeComponents.js index da05855fa06f..a12dcb5e8d3f 100644 --- a/packages/react-native/src/private/components/scrollview/HScrollViewNativeComponents.js +++ b/packages/react-native/src/private/components/scrollview/HScrollViewNativeComponents.js @@ -16,7 +16,7 @@ import AndroidHorizontalScrollViewNativeComponent from '../../../../Libraries/Co import ScrollContentViewNativeComponent from '../../../../Libraries/Components/ScrollView/ScrollContentViewNativeComponent'; import ScrollViewNativeComponent from '../../../../Libraries/Components/ScrollView/ScrollViewNativeComponent'; import Platform from '../../../../Libraries/Utilities/Platform'; -import AndroidHorizontalScrollContentViewNativeComponent from '../../specs_DEPRECATED/components/AndroidHorizontalScrollContentViewNativeComponent'; +import AndroidHorizontalScrollContentViewNativeComponent from '../../components/scrollview/specs/AndroidHorizontalScrollContentViewNativeComponent'; export const HScrollViewNativeComponent: HostComponent = Platform.OS === 'android' diff --git a/packages/react-native/src/private/specs_DEPRECATED/components/AndroidHorizontalScrollContentViewNativeComponent.js b/packages/react-native/src/private/components/scrollview/specs/AndroidHorizontalScrollContentViewNativeComponent.js similarity index 70% rename from packages/react-native/src/private/specs_DEPRECATED/components/AndroidHorizontalScrollContentViewNativeComponent.js rename to packages/react-native/src/private/components/scrollview/specs/AndroidHorizontalScrollContentViewNativeComponent.js index b5eb7511c39b..0841674ff4f5 100644 --- a/packages/react-native/src/private/specs_DEPRECATED/components/AndroidHorizontalScrollContentViewNativeComponent.js +++ b/packages/react-native/src/private/components/scrollview/specs/AndroidHorizontalScrollContentViewNativeComponent.js @@ -8,10 +8,10 @@ * @format */ -import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes'; -import type {HostComponent} from '../../types/HostComponent'; +import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; +import type {HostComponent} from '../../../types/HostComponent'; -import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent'; +import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; type AndroidHorizontalScrollContentViewNativeProps = Readonly<{ ...ViewProps, diff --git a/packages/react-native/src/private/specs_DEPRECATED/components/AndroidSwitchNativeComponent.js b/packages/react-native/src/private/components/switch/specs/AndroidSwitchNativeComponent.js similarity index 73% rename from packages/react-native/src/private/specs_DEPRECATED/components/AndroidSwitchNativeComponent.js rename to packages/react-native/src/private/components/switch/specs/AndroidSwitchNativeComponent.js index ccc16fdaba71..63fa367bc57b 100644 --- a/packages/react-native/src/private/specs_DEPRECATED/components/AndroidSwitchNativeComponent.js +++ b/packages/react-native/src/private/components/switch/specs/AndroidSwitchNativeComponent.js @@ -8,17 +8,17 @@ * @format */ -import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes'; -import type {ColorValue} from '../../../../Libraries/StyleSheet/StyleSheet'; +import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; +import type {ColorValue} from '../../../../../Libraries/StyleSheet/StyleSheet'; import type { BubblingEventHandler, Int32, WithDefault, -} from '../../../../Libraries/Types/CodegenTypes'; -import type {HostComponent} from '../../types/HostComponent'; +} from '../../../../../Libraries/Types/CodegenTypes'; +import type {HostComponent} from '../../../types/HostComponent'; -import codegenNativeCommands from '../../../../Libraries/Utilities/codegenNativeCommands'; -import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent'; +import codegenNativeCommands from '../../../../../Libraries/Utilities/codegenNativeCommands'; +import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; import * as React from 'react'; type AndroidSwitchChangeEvent = Readonly<{ diff --git a/packages/react-native/src/private/specs_DEPRECATED/components/SwitchNativeComponent.js b/packages/react-native/src/private/components/switch/specs/SwitchNativeComponent.js similarity index 73% rename from packages/react-native/src/private/specs_DEPRECATED/components/SwitchNativeComponent.js rename to packages/react-native/src/private/components/switch/specs/SwitchNativeComponent.js index 6484c8e21f1a..c237abeffacc 100644 --- a/packages/react-native/src/private/specs_DEPRECATED/components/SwitchNativeComponent.js +++ b/packages/react-native/src/private/components/switch/specs/SwitchNativeComponent.js @@ -8,17 +8,17 @@ * @format */ -import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes'; -import type {ColorValue} from '../../../../Libraries/StyleSheet/StyleSheet'; +import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; +import type {ColorValue} from '../../../../../Libraries/StyleSheet/StyleSheet'; import type { BubblingEventHandler, Int32, WithDefault, -} from '../../../../Libraries/Types/CodegenTypes'; -import type {HostComponent} from '../../types/HostComponent'; +} from '../../../../../Libraries/Types/CodegenTypes'; +import type {HostComponent} from '../../../types/HostComponent'; -import codegenNativeCommands from '../../../../Libraries/Utilities/codegenNativeCommands'; -import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent'; +import codegenNativeCommands from '../../../../../Libraries/Utilities/codegenNativeCommands'; +import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; import * as React from 'react'; type NativeSwitchChangeEvent = Readonly<{ diff --git a/packages/react-native/src/private/specs_DEPRECATED/components/UnimplementedNativeViewNativeComponent.js b/packages/react-native/src/private/components/unimplementedview/specs/UnimplementedNativeViewNativeComponent.js similarity index 64% rename from packages/react-native/src/private/specs_DEPRECATED/components/UnimplementedNativeViewNativeComponent.js rename to packages/react-native/src/private/components/unimplementedview/specs/UnimplementedNativeViewNativeComponent.js index b99df0ac2242..aea094b603ca 100644 --- a/packages/react-native/src/private/specs_DEPRECATED/components/UnimplementedNativeViewNativeComponent.js +++ b/packages/react-native/src/private/components/unimplementedview/specs/UnimplementedNativeViewNativeComponent.js @@ -8,11 +8,11 @@ * @format */ -import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes'; -import type {WithDefault} from '../../../../Libraries/Types/CodegenTypes'; -import type {HostComponent} from '../../types/HostComponent'; +import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; +import type {WithDefault} from '../../../../../Libraries/Types/CodegenTypes'; +import type {HostComponent} from '../../../types/HostComponent'; -import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent'; +import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; type UnimplementedNativeViewNativeProps = Readonly<{ ...ViewProps,