Skip to content

Commit deef8f4

Browse files
j-piaseckimeta-codesync[bot]
authored andcommitted
Reach react/renderer/graphics through its umbrella (#58881)
Summary: Pull Request resolved: #58881 Headers outside `react/renderer/graphics` that are "for frameworks", or exported without a guard, included fine-grained graphics headers. Under `RN_STRICT_API` those hit the graphics public guard, which `RN_ALLOW_FRAMEWORKS` does not suppress, so they now include `<React/Graphics.h>` instead. The guards are inert without that flag. Changelog: [Internal] Reviewed By: christophpurrer Differential Revision: D123603276 fbshipit-source-id: 940aa7e8f3d93fae093f3f66ddb4cc324992dd8d
1 parent 1449daa commit deef8f4

15 files changed

Lines changed: 15 additions & 22 deletions

File tree

‎packages/react-native/React/Fabric/RCTConversions.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77

88
#import <UIKit/UIKit.h>
99

10+
#import <React/Graphics.h>
1011
#import <react/renderer/components/view/AccessibilityPrimitives.h>
1112
#import <react/renderer/components/view/primitives.h>
1213
#import <react/renderer/core/LayoutPrimitives.h>
13-
#import <react/renderer/graphics/Color.h>
1414
#import <react/renderer/graphics/RCTPlatformColorUtils.h>
15-
#import <react/renderer/graphics/Transform.h>
1615
#import <react/timing/primitives.h>
1716

1817
NS_ASSUME_NONNULL_BEGIN

‎packages/react-native/React/Fabric/Utils/RCTBackgroundImageUtils.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77

88
#import <Foundation/Foundation.h>
99
#import <QuartzCore/QuartzCore.h>
10-
#import <react/renderer/graphics/BackgroundPosition.h>
11-
#import <react/renderer/graphics/BackgroundRepeat.h>
12-
#import <react/renderer/graphics/BackgroundSize.h>
10+
#import <React/Graphics.h>
1311

1412
@interface RCTBackgroundImageUtils : NSObject
1513

‎packages/react-native/React/Fabric/Utils/RCTBoxShadow.h‎

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

88
#import <vector>
99

10+
#import <React/Graphics.h>
1011
#import <React/RCTBorderDrawing.h>
1112
#import <React/RCTDefines.h>
1213
#import <UIKit/UIKit.h>
13-
#import <react/renderer/graphics/BoxShadow.h>
1414

1515
RCT_EXTERN CALayer *RCTGetBoxShadowLayer(
1616
const facebook::react::BoxShadow &shadow,

‎packages/react-native/React/Fabric/Utils/RCTGradientUtils.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
#include <Foundation/Foundation.h>
9-
#include <react/renderer/graphics/ColorStop.h>
9+
#include <React/Graphics.h>
1010
#import <vector>
1111

1212
NS_ASSUME_NONNULL_BEGIN

‎packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewState.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/Graphics.h>
1213
#include <React/RendererCore.h>
13-
#include <react/renderer/graphics/Float.h>
1414
#include "ModalHostViewUtils.h"
1515

1616
#ifdef RN_SERIALIZABLE_STATE

‎packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewUtils.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/graphics/Size.h>
12+
#include <React/Graphics.h>
1313

1414
namespace facebook::react {
1515

‎packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollEvent.h‎

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

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

12+
#include <React/Graphics.h>
1213
#include <React/RendererCore.h>
1314
#include <React/RendererDebug.h>
1415
#include <folly/dynamic.h>
15-
#include <react/renderer/graphics/RectangleEdges.h>
16-
#include <react/renderer/graphics/Size.h>
1716

1817
#include <optional>
1918
#include <string>

‎packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewState.h‎

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

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

12-
#include <react/renderer/graphics/Float.h>
13-
#include <react/renderer/graphics/Point.h>
14-
#include <react/renderer/graphics/Rect.h>
15-
#include <react/renderer/graphics/Size.h>
12+
#include <React/Graphics.h>
1613

1714
#ifdef RN_SERIALIZABLE_STATE
1815
#include <folly/dynamic.h>

‎packages/react-native/ReactCommon/react/renderer/components/scrollview/platform/android/react/renderer/components/scrollview/HostPlatformScrollViewProps.h‎

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

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

12+
#include <React/Graphics.h>
1213
#include <React/RendererCore.h>
1314
#include <React/RendererDebug.h>
1415
#include <folly/dynamic.h>
1516
#include <react/renderer/components/scrollview/BaseScrollViewProps.h>
1617
#include <react/renderer/components/scrollview/primitives.h>
17-
#include <react/renderer/graphics/Color.h>
1818

1919
#include <string>
2020

‎packages/react-native/ReactCommon/react/renderer/components/text/BaseTextProps.h‎

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

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

12+
#include <React/Graphics.h>
1213
#include <React/RendererCore.h>
1314
#include <react/renderer/attributedstring/TextAttributes.h>
14-
#include <react/renderer/graphics/Color.h>
1515

1616
namespace facebook::react {
1717

0 commit comments

Comments
 (0)