Skip to content

Commit 5c72ae8

Browse files
j-piaseckifacebook-github-bot
j-piasecki
authored and
facebook-github-bot
committed
Retier react/renderer/uimanager headers (#58846)
Summary: Make `AppRegistryBinding.h`, `LayoutEventEmitter.h` and the deprecated `SurfaceRegistryBinding.h` private; they are only used inside React Native. `UIManagerViewTransitionDelegate.h` now reaches `Float.h` through the `<React/Graphics.h>` umbrella instead of including it directly, since `Float.h` is public and its guard rejects direct includes from for-frameworks headers. Changelog: [Internal] Reviewed By: christophpurrer Differential Revision: D123391983
1 parent 8d658f4 commit 5c72ae8

7 files changed

Lines changed: 5 additions & 43 deletions

File tree

‎packages/react-native/ReactCommon/react/renderer/uimanager/AppRegistryBinding.h‎

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

88
#pragma once
99

10-
#include <react/cxxstableapi/FrameworksGuard.h>
10+
#include <react/cxxstableapi/PrivateGuard.h>
1111

1212
#include <React/RendererCore.h>
1313

‎packages/react-native/ReactCommon/react/renderer/uimanager/LayoutEventEmitter.h‎

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

88
#pragma once
99

10-
#include <react/cxxstableapi/FrameworksGuard.h>
10+
#include <react/cxxstableapi/PrivateGuard.h>
1111

1212
#include <react/renderer/uimanager/UIManagerCommitHook.h>
1313

‎packages/react-native/ReactCommon/react/renderer/uimanager/SurfaceRegistryBinding.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
#pragma once
99

10+
#include <react/cxxstableapi/PrivateGuard.h>
11+
1012
#warning "The SurfaceRegistryBinding.h header has been renamed to AppRegistryBinding.h"
1113

1214
#include <react/renderer/uimanager/AppRegistryBinding.h>

‎packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerViewTransitionDelegate.h‎

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

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

12+
#include <React/Graphics.h>
1213
#include <React/RendererCore.h>
1314

1415
#include <functional>
1516
#include <memory>
1617
#include <optional>
1718
#include <string>
1819

19-
#include <react/renderer/graphics/Float.h>
20-
2120
namespace facebook::react {
2221

2322
class UIManagerViewTransitionDelegate {

‎scripts/cxx-api/api-snapshots/ReactAndroidFrameworksCxx.api‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1326,13 +1326,6 @@ class facebook::react::AnimationChoreographer {
13261326
public void setAnimationBackend(std::weak_ptr<facebook::react::UIManagerAnimationBackend> animationBackend);
13271327
}
13281328

1329-
class facebook::react::AppRegistryBinding {
1330-
public AppRegistryBinding() = delete;
1331-
public static void setSurfaceProps(facebook::jsi::Runtime& runtime, facebook::react::SurfaceId surfaceId, const std::string& moduleName, const folly::dynamic& initialProps, facebook::react::DisplayMode displayMode);
1332-
public static void startSurface(facebook::jsi::Runtime& runtime, facebook::react::SurfaceId surfaceId, const std::string& moduleName, const folly::dynamic& initialProps, facebook::react::DisplayMode displayMode);
1333-
public static void stopSurface(facebook::jsi::Runtime& runtime, facebook::react::SurfaceId surfaceId);
1334-
}
1335-
13361329
class facebook::react::AsyncArrayBuffer {
13371330
public AsyncArrayBuffer(const facebook::react::AsyncArrayBuffer&) = delete;
13381331
public AsyncArrayBuffer(facebook::react::AsyncArrayBuffer&&) noexcept = default;
@@ -2600,12 +2593,6 @@ class facebook::react::LayoutAnimationStatusDelegate {
26002593
class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode<facebook::react::LayoutConformanceShadowNodeComponentName, facebook::react::YogaLayoutableShadowNode, facebook::react::LayoutConformanceProps> {
26012594
}
26022595

2603-
class facebook::react::LayoutEventEmitter : public facebook::react::UIManagerCommitHook {
2604-
public virtual void commitHookWasRegistered(const facebook::react::UIManager&) noexcept override;
2605-
public virtual void commitHookWasUnregistered(const facebook::react::UIManager&) noexcept override;
2606-
public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree& shadowTree, const facebook::react::RootShadowNode::Shared& rootShadowNode, const std::vector<const facebook::react::LayoutableShadowNode*>& affectedLayoutableNodes) noexcept override;
2607-
}
2608-
26092596
class facebook::react::LayoutableShadowNode : public facebook::react::ShadowNode {
26102597
public LayoutableShadowNode(const facebook::react::ShadowNode& sourceShadowNode, const facebook::react::ShadowNodeFragment& fragment);
26112598
public LayoutableShadowNode(const facebook::react::ShadowNodeFragment& fragment, const facebook::react::ShadowNodeFamily::Shared& family, facebook::react::ShadowNodeTraits traits);

‎scripts/cxx-api/api-snapshots/ReactAppleFrameworksCxx.api‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3921,13 +3921,6 @@ class facebook::react::AnimationChoreographer {
39213921
public void setAnimationBackend(std::weak_ptr<facebook::react::UIManagerAnimationBackend> animationBackend);
39223922
}
39233923

3924-
class facebook::react::AppRegistryBinding {
3925-
public AppRegistryBinding() = delete;
3926-
public static void setSurfaceProps(facebook::jsi::Runtime& runtime, facebook::react::SurfaceId surfaceId, const std::string& moduleName, const folly::dynamic& initialProps, facebook::react::DisplayMode displayMode);
3927-
public static void startSurface(facebook::jsi::Runtime& runtime, facebook::react::SurfaceId surfaceId, const std::string& moduleName, const folly::dynamic& initialProps, facebook::react::DisplayMode displayMode);
3928-
public static void stopSurface(facebook::jsi::Runtime& runtime, facebook::react::SurfaceId surfaceId);
3929-
}
3930-
39313924
class facebook::react::AppleEventBeat : public facebook::react::EventBeat, public facebook::react::RunLoopObserver::Delegate {
39323925
public AppleEventBeat(const facebook::react::AppleEventBeat&) = delete;
39333926
public AppleEventBeat(facebook::react::AppleEventBeat&&) = delete;
@@ -4836,12 +4829,6 @@ class facebook::react::LayoutAnimationStatusDelegate {
48364829
class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode<facebook::react::LayoutConformanceShadowNodeComponentName, facebook::react::YogaLayoutableShadowNode, facebook::react::LayoutConformanceProps> {
48374830
}
48384831

4839-
class facebook::react::LayoutEventEmitter : public facebook::react::UIManagerCommitHook {
4840-
public virtual void commitHookWasRegistered(const facebook::react::UIManager&) noexcept override;
4841-
public virtual void commitHookWasUnregistered(const facebook::react::UIManager&) noexcept override;
4842-
public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree& shadowTree, const facebook::react::RootShadowNode::Shared& rootShadowNode, const std::vector<const facebook::react::LayoutableShadowNode*>& affectedLayoutableNodes) noexcept override;
4843-
}
4844-
48454832
class facebook::react::LayoutableShadowNode : public facebook::react::ShadowNode {
48464833
public LayoutableShadowNode(const facebook::react::ShadowNode& sourceShadowNode, const facebook::react::ShadowNodeFragment& fragment);
48474834
public LayoutableShadowNode(const facebook::react::ShadowNodeFragment& fragment, const facebook::react::ShadowNodeFamily::Shared& family, facebook::react::ShadowNodeTraits traits);

‎scripts/cxx-api/api-snapshots/ReactCommonFrameworksCxx.api‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -663,13 +663,6 @@ class facebook::react::AnimationChoreographer {
663663
public void setAnimationBackend(std::weak_ptr<facebook::react::UIManagerAnimationBackend> animationBackend);
664664
}
665665

666-
class facebook::react::AppRegistryBinding {
667-
public AppRegistryBinding() = delete;
668-
public static void setSurfaceProps(facebook::jsi::Runtime& runtime, facebook::react::SurfaceId surfaceId, const std::string& moduleName, const folly::dynamic& initialProps, facebook::react::DisplayMode displayMode);
669-
public static void startSurface(facebook::jsi::Runtime& runtime, facebook::react::SurfaceId surfaceId, const std::string& moduleName, const folly::dynamic& initialProps, facebook::react::DisplayMode displayMode);
670-
public static void stopSurface(facebook::jsi::Runtime& runtime, facebook::react::SurfaceId surfaceId);
671-
}
672-
673666
class facebook::react::AsyncArrayBuffer {
674667
public AsyncArrayBuffer(const facebook::react::AsyncArrayBuffer&) = delete;
675668
public AsyncArrayBuffer(facebook::react::AsyncArrayBuffer&&) noexcept = default;
@@ -1526,12 +1519,6 @@ class facebook::react::LayoutAnimationStatusDelegate {
15261519
class facebook::react::LayoutConformanceShadowNode : public facebook::react::ConcreteShadowNode<facebook::react::LayoutConformanceShadowNodeComponentName, facebook::react::YogaLayoutableShadowNode, facebook::react::LayoutConformanceProps> {
15271520
}
15281521

1529-
class facebook::react::LayoutEventEmitter : public facebook::react::UIManagerCommitHook {
1530-
public virtual void commitHookWasRegistered(const facebook::react::UIManager&) noexcept override;
1531-
public virtual void commitHookWasUnregistered(const facebook::react::UIManager&) noexcept override;
1532-
public virtual void shadowTreeDidCommit(const facebook::react::ShadowTree& shadowTree, const facebook::react::RootShadowNode::Shared& rootShadowNode, const std::vector<const facebook::react::LayoutableShadowNode*>& affectedLayoutableNodes) noexcept override;
1533-
}
1534-
15351522
class facebook::react::LayoutableShadowNode : public facebook::react::ShadowNode {
15361523
public LayoutableShadowNode(const facebook::react::ShadowNode& sourceShadowNode, const facebook::react::ShadowNodeFragment& fragment);
15371524
public LayoutableShadowNode(const facebook::react::ShadowNodeFragment& fragment, const facebook::react::ShadowNodeFamily::Shared& family, facebook::react::ShadowNodeTraits traits);

0 commit comments

Comments
 (0)