Skip to content

Commit e8061e0

Browse files
coadometa-codesync[bot]
coado
authored and
meta-codesync[bot]
committed
Use public umbrellas in textinput headers (#58587)
Summary: Pull Request resolved: #58587 Route public React Native dependencies in exported TextInput framework headers through their supported umbrella headers. Preserve fine-grained includes for same-target, framework-tier, graphics, and third-party dependencies. Changelog: [Internal] Reviewed By: cipolleschi Differential Revision: D120677815
1 parent 0825b7f commit e8061e0

15 files changed

Lines changed: 23 additions & 35 deletions

File tree

‎packages/react-native/Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ let reactFabricTextInput = RNTarget(
553553
name: .reactFabricTextInput,
554554
path: "ReactCommon/react/renderer/components/textinput",
555555
excludedPaths: ["platform/android", "platform/macos"],
556-
dependencies: [.reactNativeDependencies, .reactCore, .reactJsiExecutor, .reactTurboModuleCore, .jsi, .logger, .reactDebug, .reactFeatureFlags, .reactUtils, .reactRuntimeScheduler, .reactCxxReact, .yoga, .reactRendererDebug, .reactGraphics, .reactFabric, .reactTurboModuleBridging, .reactFabricTextLayoutManager],
556+
dependencies: [.reactNativeDependencies, .reactCore, .reactJsiExecutor, .reactTurboModuleCore, .jsi, .logger, .reactDebug, .reactFeatureFlags, .reactUtils, .reactRuntimeScheduler, .reactCxxReact, .yoga, .reactRendererDebug, .reactGraphics, .reactFabric, .reactTurboModuleBridging, .reactFabricTextLayoutManager, .reactImageManagerApple],
557557
sources: [".", "platform/ios"]
558558
)
559559

‎packages/react-native/ReactCommon/React-FabricComponents.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ Pod::Spec.new do |s|
8181
add_dependency(s, "React-RCTFBReactNativeSpec")
8282
add_dependency(s, "React-rendererdebug")
8383
add_dependency(s, "React-graphics", :additional_framework_paths => ["react/renderer/graphics/platform/ios"])
84+
add_dependency(s, "React-ImageManager", :additional_framework_paths => ["react/renderer/imagemanager/platform/ios"])
8485
add_dependency(s, "React-Fabric", :additional_framework_paths => [
8586
"react/renderer/components/scrollview/platform/cxx",
8687
"react/renderer/components/scrollview/platform/ios",
87-
"react/renderer/components/view/platform/cxx",
88-
"react/renderer/imagemanager/platform/ios"
88+
"react/renderer/components/view/platform/cxx"
8989
])
9090

9191
depend_on_js_engine(s)

‎packages/react-native/ReactCommon/react/renderer/components/textinput/BaseTextInputProps.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99

1010
#include <react/cxxstableapi/FrameworksGuard.h>
1111

12+
#include <React/RendererCore.h>
13+
#include <React/View.h>
1214
#include <react/renderer/attributedstring/ParagraphAttributes.h>
1315
#include <react/renderer/components/text/BaseTextProps.h>
1416
#include <react/renderer/components/textinput/basePrimitives.h>
15-
#include <react/renderer/components/view/ViewProps.h>
16-
#include <react/renderer/core/PropsParserContext.h>
1717
#include <react/renderer/graphics/Color.h>
1818
#include <limits>
1919
#include <string>

‎packages/react-native/ReactCommon/react/renderer/components/textinput/BaseTextInputShadowNode.h‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,17 @@
1111

1212
#include <glog/logging.h>
1313

14+
#include <React/RendererCore.h>
15+
#include <React/Utils.h>
16+
#include <React/View.h>
1417
#include <react/renderer/attributedstring/AttributedString.h>
1518
#include <react/renderer/attributedstring/AttributedStringBox.h>
1619
#include <react/renderer/components/text/BaseTextShadowNode.h>
1720
#include <react/renderer/components/textinput/BaseTextInputProps.h>
1821
#include <react/renderer/components/textinput/TextInputState.h>
19-
#include <react/renderer/components/view/ConcreteViewShadowNode.h>
20-
#include <react/renderer/components/view/YogaLayoutableShadowNode.h>
21-
#include <react/renderer/core/LayoutConstraints.h>
22-
#include <react/renderer/core/LayoutContext.h>
2322
#include <react/renderer/textlayoutmanager/TextLayoutContext.h>
2423
#include <react/renderer/textlayoutmanager/TextLayoutManager.h>
2524
#include <react/renderer/textlayoutmanager/TextLayoutManagerExtended.h>
26-
#include <react/utils/ContextContainer.h>
2725

2826
namespace facebook::react {
2927

‎packages/react-native/ReactCommon/react/renderer/components/textinput/TextInputEventEmitter.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
#include <react/cxxstableapi/FrameworksGuard.h>
1111

12+
#include <React/View.h>
1213
#include <react/renderer/attributedstring/AttributedString.h>
13-
#include <react/renderer/components/view/ViewEventEmitter.h>
1414

1515
namespace facebook::react {
1616

‎packages/react-native/ReactCommon/react/renderer/components/textinput/baseConversions.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@
99

1010
#include <react/cxxstableapi/FrameworksGuard.h>
1111

12+
#include <React/RendererCore.h>
1213
#include <react/renderer/components/textinput/basePrimitives.h>
13-
#include <react/renderer/core/PropsParserContext.h>
14-
#include <react/renderer/core/RawValue.h>
1514
#include <string>
1615

1716
namespace facebook::react {

‎packages/react-native/ReactCommon/react/renderer/components/textinput/platform/android/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#include <unordered_map>
2121

22-
#include <react/renderer/core/ConcreteComponentDescriptor.h>
22+
#include <React/RendererCore.h>
2323

2424
namespace facebook::react {
2525

‎packages/react-native/ReactCommon/react/renderer/components/textinput/platform/android/react/renderer/components/androidtextinput/AndroidTextInputEventEmitter.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include <react/cxxstableapi/FrameworksGuard.h>
1111

12-
#include <react/renderer/components/view/ViewEventEmitter.h>
12+
#include <React/View.h>
1313

1414
namespace facebook::react {
1515

‎packages/react-native/ReactCommon/react/renderer/components/textinput/platform/android/react/renderer/components/androidtextinput/AndroidTextInputProps.h‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,13 @@
99

1010
#include <react/cxxstableapi/FrameworksGuard.h>
1111

12-
#include <react/renderer/core/Props.h>
13-
#include <react/renderer/graphics/Color.h>
14-
12+
#include <React/ImageManager.h>
13+
#include <React/RendererCore.h>
1514
#include <react/renderer/attributedstring/TextAttributes.h>
1615
#include <react/renderer/attributedstring/conversions.h>
1716
#include <react/renderer/components/textinput/BaseTextInputProps.h>
1817
#include <react/renderer/components/textinput/basePrimitives.h>
19-
#include <react/renderer/core/PropsParserContext.h>
20-
#include <react/renderer/core/propsConversions.h>
2118
#include <react/renderer/graphics/Color.h>
22-
#include <react/renderer/imagemanager/primitives.h>
2319
#include <unordered_map>
2420

2521
namespace facebook::react {

‎packages/react-native/ReactCommon/react/renderer/components/textinput/platform/android/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
#include "AndroidTextInputProps.h"
1414
#include "AndroidTextInputState.h"
1515

16+
#include <React/Utils.h>
17+
#include <React/View.h>
1618
#include <react/renderer/attributedstring/AttributedString.h>
17-
#include <react/renderer/components/view/ConcreteViewShadowNode.h>
18-
#include <react/utils/ContextContainer.h>
1919

2020
namespace facebook::react {
2121

0 commit comments

Comments
 (0)