Skip to content

Commit ab23a47

Browse files
coadometa-codesync[bot]
authored andcommitted
Use public umbrellas in attributedstring headers
Summary: Migrate React-Fabric attributedstring headers to consume stable Debug, FeatureFlags, CSS, Graphics, MapBuffer, RendererCore, Utils, and View umbrellas instead of guarded leaf headers. Add the direct Buck and CocoaPods dependencies required by those public imports. Avoid RendererDebug.h because its current utility-template export changes downstream overload lookup; RendererCore already provides the debug declaration types used by attributedstring. Changelog: [Internal] Differential Revision: D121793359
1 parent ff7ce4c commit ab23a47

6 files changed

Lines changed: 19 additions & 28 deletions

File tree

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@ Pod::Spec.new do |s|
9999
end
100100

101101
s.subspec "attributedstring" do |ss|
102+
ss.dependency "React-Fabric/coreUmbrella"
103+
ss.dependency "React-Fabric/components/viewUmbrella"
104+
ss.dependency "React-renderercss"
102105
ss.source_files = podspec_sources("react/renderer/attributedstring/**/*.{m,mm,cpp,h}", "react/renderer/attributedstring/**/*.{h}")
103106
ss.exclude_files = "react/renderer/attributedstring/tests"
104107
ss.header_dir = "react/renderer/attributedstring"

‎packages/react-native/ReactCommon/react/renderer/attributedstring/AttributedString.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +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/TextAttributes.h>
13-
#include <react/renderer/core/Sealable.h>
14-
#include <react/renderer/debug/DebugStringConvertible.h>
1515
#include <react/renderer/mounting/ShadowView.h>
16-
#include <react/utils/hash_combine.h>
1716

1817
namespace facebook::react {
1918

‎packages/react-native/ReactCommon/react/renderer/attributedstring/AttributedStringBox.h‎

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

1212
#include <memory>
1313

14+
#include <React/Debug.h>
1415
#include <react/renderer/attributedstring/AttributedString.h>
1516

1617
namespace facebook::react {

‎packages/react-native/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.h‎

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

1212
#include <limits>
1313

14+
#include <React/Graphics.h>
15+
#include <React/RendererCore.h>
16+
#include <React/Utils.h>
1417
#include <react/renderer/attributedstring/primitives.h>
15-
#include <react/renderer/debug/DebugStringConvertible.h>
16-
#include <react/renderer/graphics/Float.h>
17-
#include <react/utils/hash_combine.h>
1818

1919
namespace facebook::react {
2020

‎packages/react-native/ReactCommon/react/renderer/attributedstring/TextAttributes.h‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,12 @@
1414
#include <optional>
1515
#include <vector>
1616

17+
#include <React/Graphics.h>
18+
#include <React/RendererCore.h>
19+
#include <React/Utils.h>
20+
#include <React/View.h>
1721
#include <folly/dynamic.h>
1822
#include <react/renderer/attributedstring/primitives.h>
19-
#include <react/renderer/components/view/AccessibilityPrimitives.h>
20-
#include <react/renderer/core/LayoutPrimitives.h>
21-
#include <react/renderer/core/ReactPrimitives.h>
22-
#include <react/renderer/debug/DebugStringConvertible.h>
23-
#include <react/renderer/graphics/Color.h>
24-
#include <react/renderer/graphics/Float.h>
25-
#include <react/renderer/graphics/Size.h>
26-
#include <react/utils/hash_combine.h>
2723

2824
namespace facebook::react {
2925

‎packages/react-native/ReactCommon/react/renderer/attributedstring/conversions.h‎

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

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

12-
#include <react/debug/react_native_expect.h>
13-
#include <react/featureflags/ReactNativeFeatureFlags.h>
12+
#include <React/CSS.h>
13+
#include <React/Debug.h>
14+
#include <React/FeatureFlags.h>
15+
#include <React/RendererCore.h>
16+
#include <React/View.h>
1417
#include <react/renderer/attributedstring/AttributedString.h>
1518
#include <react/renderer/attributedstring/ParagraphAttributes.h>
1619
#include <react/renderer/attributedstring/TextAttributes.h>
17-
#include <react/renderer/attributedstring/conversions.h>
1820
#include <react/renderer/attributedstring/primitives.h>
19-
#include <react/renderer/components/view/accessibilityPropsConversions.h>
20-
#include <react/renderer/core/LayoutableShadowNode.h>
21-
#include <react/renderer/core/PropsParserContext.h>
22-
#include <react/renderer/core/ShadowNode.h>
23-
#include <react/renderer/core/conversions.h>
24-
#include <react/renderer/core/graphicsConversions.h>
25-
#include <react/renderer/core/propsConversions.h>
26-
#include <react/renderer/css/CSSFontVariant.h>
27-
#include <react/renderer/css/CSSValueParser.h>
2821
#include <unordered_map>
2922

3023
#ifdef RN_SERIALIZABLE_STATE
24+
#include <React/MapBuffer.h>
3125
#include <folly/json.h>
32-
#include <react/renderer/mapbuffer/MapBuffer.h>
33-
#include <react/renderer/mapbuffer/MapBufferBuilder.h>
3426
#endif
3527

3628
#include <glog/logging.h>

0 commit comments

Comments
 (0)