Skip to content

Commit 277e57e

Browse files
coadometa-codesync[bot]
authored andcommitted
Make ModalHostViewUtils header private (#58957)
Summary: Pull Request resolved: #58957 `react/renderer/components/modal/ModalHostViewUtils.h` declares `ModalHostViewScreenSize()`, a per-platform helper that is only used to compute the default screen size of `ModalHostViewState`. Lower it from "for frameworks" to private. It was reachable from the "for frameworks" API only because `ModalHostViewState.h` called it from an inline default constructor. Move that constructor out of line into `ModalHostViewState.cpp`, so `ModalHostViewState.h` no longer includes the utils header. While here, `ModalHostViewState.h` now gets `Float`/`Size` from the `<React/Graphics.h>` umbrella instead of including the public `react/renderer/graphics/Float.h` directly (`Size` previously only arrived transitively through the utils header). The C++ API snapshots are regenerated: `ModalHostViewScreenSize()` is removed from the Frameworks snapshots. Changelog: [Internal] Reviewed By: cortinico Differential Revision: D124105062 fbshipit-source-id: e385009a626f96a7363f88c06438865fb0fd3940
1 parent 0ffaff8 commit 277e57e

6 files changed

Lines changed: 6 additions & 6 deletions

File tree

‎packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewState.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,13 @@
66
*/
77

88
#include "ModalHostViewState.h"
9+
#include "ModalHostViewUtils.h"
910

1011
namespace facebook::react {
1112

13+
ModalHostViewState::ModalHostViewState()
14+
: screenSize(ModalHostViewScreenSize()) {}
15+
1216
#ifdef RN_SERIALIZABLE_STATE
1317
folly::dynamic ModalHostViewState::getDynamic() const {
1418
return folly::dynamic::object("screenWidth", screenSize.width)(

‎packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewState.h‎

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

1212
#include <React/Graphics.h>
1313
#include <React/RendererCore.h>
14-
#include "ModalHostViewUtils.h"
1514

1615
#ifdef RN_SERIALIZABLE_STATE
1716
#include <folly/dynamic.h>
@@ -26,7 +25,7 @@ class ModalHostViewState final {
2625
public:
2726
using Shared = std::shared_ptr<const ModalHostViewState>;
2827

29-
ModalHostViewState() : screenSize(ModalHostViewScreenSize()) {}
28+
ModalHostViewState();
3029
ModalHostViewState(Size screenSize_) : screenSize(screenSize_) {};
3130

3231
#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
@@ -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/Graphics.h>
1313

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,6 @@ facebook::react::SharedColor facebook::react::colorFromComponents(facebook::reac
741741
facebook::react::SharedColor facebook::react::colorFromRGBA(uint8_t r, uint8_t g, uint8_t b, uint8_t a);
742742
facebook::react::SharedColor facebook::react::parsePlatformColor(const facebook::react::ContextContainer& contextContainer, int32_t surfaceId, const facebook::react::RawValue& value);
743743
facebook::react::SharedColor facebook::react::whiteColor();
744-
facebook::react::Size facebook::react::ModalHostViewScreenSize(void);
745744
facebook::react::Size facebook::react::yogaMeassureToSize(int64_t value);
746745
facebook::react::SurfaceId facebook::react::getNextRootViewTag() noexcept;
747746
facebook::react::TurboModuleMethodValueKind facebook::react::getTurboModuleMethodValueKind(facebook::jsi::Runtime& rt, const facebook::jsi::Value* value);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3541,7 +3541,6 @@ facebook::react::SharedColor facebook::react::colorFromComponents(facebook::reac
35413541
facebook::react::SharedColor facebook::react::colorFromRGBA(uint8_t r, uint8_t g, uint8_t b, uint8_t a);
35423542
facebook::react::SharedColor facebook::react::parsePlatformColor(const facebook::react::ContextContainer& contextContainer, int32_t surfaceId, const facebook::react::RawValue& value);
35433543
facebook::react::SharedColor facebook::react::whiteColor();
3544-
facebook::react::Size facebook::react::ModalHostViewScreenSize(void);
35453544
facebook::react::Size facebook::react::yogaMeassureToSize(int64_t value);
35463545
facebook::react::SurfaceId facebook::react::getNextRootViewTag() noexcept;
35473546
facebook::react::TurboModuleMethodValueKind facebook::react::getTurboModuleMethodValueKind(facebook::jsi::Runtime& rt, const facebook::jsi::Value* value);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,6 @@ facebook::react::SharedColor facebook::react::clearColor();
337337
facebook::react::SharedColor facebook::react::colorFromComponents(facebook::react::ColorComponents components);
338338
facebook::react::SharedColor facebook::react::colorFromRGBA(uint8_t r, uint8_t g, uint8_t b, uint8_t a);
339339
facebook::react::SharedColor facebook::react::whiteColor();
340-
facebook::react::Size facebook::react::ModalHostViewScreenSize(void);
341340
facebook::react::Size facebook::react::yogaMeassureToSize(int64_t value);
342341
facebook::react::SurfaceId facebook::react::getNextRootViewTag() noexcept;
343342
facebook::react::TurboModuleMethodValueKind facebook::react::getTurboModuleMethodValueKind(facebook::jsi::Runtime& rt, const facebook::jsi::Value* value);

0 commit comments

Comments
 (0)