Skip to content

Commit 2017d64

Browse files
j-piaseckimeta-codesync[bot]
j-piasecki
authored and
meta-codesync[bot]
committed
Use umbrella includes in textlayoutmanager headers (#58665)
Summary: Pull Request resolved: #58665 Switch the public headers of `react/renderer/textlayoutmanager` from fine-grained cross-module includes to the stable umbrella headers (`<React/Graphics.h>`, `<React/RendererCore.h>`, `<React/Utils.h>`). Implementation files keep using the fine-grained headers. Adds the `react/renderer/graphics` umbrella search path to `React-FabricComponents` for framework builds, since textlayoutmanager headers now reach it through the umbrella. No new module dependencies are needed. Changelog: [Internal] Differential Revision: D121582300
1 parent 6eea6bc commit 2017d64

10 files changed

Lines changed: 15 additions & 16 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ if ENV['USE_FRAMEWORKS']
4141
"\"$(PODS_TARGET_SRCROOT)/react/renderer/components/view\"",
4242
"\"$(PODS_TARGET_SRCROOT)/react/renderer/core\"",
4343
"\"$(PODS_TARGET_SRCROOT)/react/renderer/debug\"",
44+
"\"$(PODS_TARGET_SRCROOT)/react/renderer/graphics\"",
4445
"\"$(PODS_TARGET_SRCROOT)/react/utils\"",
4546
]
4647
end

‎packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextLayoutContext.h‎

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

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

12-
#include <react/renderer/core/ReactPrimitives.h>
13-
#include <react/renderer/graphics/Float.h>
12+
#include <React/Graphics.h>
13+
#include <React/RendererCore.h>
1414

1515
namespace facebook::react {
1616

‎packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextLayoutManagerExtended.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
#include <glog/logging.h>
1313
#include <cstddef>
1414

15+
#include <React/Graphics.h>
1516
#include <react/renderer/attributedstring/AttributedStringBox.h>
1617
#include <react/renderer/attributedstring/ParagraphAttributes.h>
17-
#include <react/renderer/graphics/Size.h>
1818
#include <react/renderer/textlayoutmanager/TextLayoutManager.h>
1919
#include <react/renderer/textlayoutmanager/TextMeasureCache.h>
2020

‎packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h‎

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

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

12+
#include <React/RendererCore.h>
13+
#include <React/Utils.h>
1214
#include <react/renderer/attributedstring/AttributedString.h>
1315
#include <react/renderer/attributedstring/ParagraphAttributes.h>
14-
#include <react/renderer/core/LayoutConstraints.h>
15-
#include <react/utils/FloatComparison.h>
16-
#include <react/utils/SimpleThreadSafeCache.h>
17-
#include <react/utils/hash_combine.h>
1816

1917
namespace facebook::react {
2018

‎packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasurementRounding.h‎

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

1212
#include <cmath>
1313

14-
#include <react/renderer/graphics/Size.h>
14+
#include <React/Graphics.h>
1515

1616
namespace facebook::react {
1717

‎packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h‎

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

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

12+
#include <React/RendererCore.h>
13+
#include <React/Utils.h>
1214
#include <react/jni/SafeReleaseJniRef.h>
1315
#include <react/renderer/attributedstring/AttributedStringBox.h>
1416
#include <react/renderer/attributedstring/ParagraphAttributes.h>
15-
#include <react/renderer/core/LayoutConstraints.h>
1617
#include <react/renderer/textlayoutmanager/JPreparedLayout.h>
1718
#include <react/renderer/textlayoutmanager/TextLayoutContext.h>
1819
#include <react/renderer/textlayoutmanager/TextMeasureCache.h>
19-
#include <react/utils/ContextContainer.h>
2020

2121
#include <fbjni/fbjni.h>
2222
#include <memory>

‎packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/react/renderer/textlayoutmanager/TextLayoutManager.h‎

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

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

12+
#include <React/RendererCore.h>
13+
#include <React/Utils.h>
1214
#include <react/renderer/attributedstring/AttributedStringBox.h>
1315
#include <react/renderer/attributedstring/ParagraphAttributes.h>
14-
#include <react/renderer/core/LayoutConstraints.h>
1516
#include <react/renderer/textlayoutmanager/TextLayoutContext.h>
1617
#include <react/renderer/textlayoutmanager/TextMeasureCache.h>
17-
#include <react/utils/ContextContainer.h>
1818
#include <memory>
1919

2020
namespace facebook::react {

‎packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.h‎

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

1010
#import <UIKit/UIKit.h>
1111

12+
#import <React/RendererCore.h>
1213
#import <react/renderer/attributedstring/AttributedString.h>
1314
#import <react/renderer/attributedstring/ParagraphAttributes.h>
14-
#import <react/renderer/core/LayoutConstraints.h>
1515
#import <react/renderer/textlayoutmanager/TextLayoutContext.h>
1616
#import <react/renderer/textlayoutmanager/TextMeasureCache.h>
1717

‎packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextPrimitivesConversions.h‎

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

1010
#import <UIKit/UIKit.h>
1111

12-
#include <react/renderer/graphics/RCTPlatformColorUtils.h>
12+
#include <React/Graphics.h>
1313
#include <react/renderer/textlayoutmanager/RCTFontProperties.h>
1414
#include <react/renderer/textlayoutmanager/RCTFontUtils.h>
1515

‎packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/TextLayoutManager.h‎

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

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

12+
#include <React/RendererCore.h>
13+
#include <React/Utils.h>
1214
#include <react/renderer/attributedstring/AttributedStringBox.h>
1315
#include <react/renderer/attributedstring/ParagraphAttributes.h>
14-
#include <react/renderer/core/LayoutConstraints.h>
1516
#include <react/renderer/textlayoutmanager/TextLayoutContext.h>
1617
#include <react/renderer/textlayoutmanager/TextMeasureCache.h>
17-
#include <react/utils/ContextContainer.h>
1818
#include <memory>
1919

2020
namespace facebook::react {

0 commit comments

Comments
 (0)