From 34ecdac71cbee6a0dbcb18221781b32772fa10b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Ma=C5=82ecki?= <maleckidawid@meta.com>
Date: Tue, 6 Oct 2026 01:59:18 -0700
Subject: [PATCH] Make Image component implementation headers for-frameworks

Summary:
Lower `ImageComponentDescriptor.h`, `ImageShadowNode.h`, `ImageProps.h`, `ImageState.h` and `ImageEventEmitter.h` in `react/renderer/components/image` from public to "for frameworks". They implement the built-in `<Image>` component and are consumed by hosts that register core components and by platform image renderers, not by app code. This matches the tiering of the `text`, `scrollview` and `root` component modules.

`conversions.h` stays public and is now the only header in the `<React/Image.h>` umbrella: code generated for a component with an `ImageSource` prop includes `<React/Image.h>` and relies on its `fromRawValue(..., ImageSource &)` overload through `convertRawProp`.

Changelog: [Internal]

Differential Revision: D123593354
---
 .../renderer/components/image/ImageComponentDescriptor.h     | 2 +-
 .../react/renderer/components/image/ImageEventEmitter.h      | 2 +-
 .../ReactCommon/react/renderer/components/image/ImageProps.h | 2 +-
 .../react/renderer/components/image/ImageShadowNode.h        | 2 +-
 .../ReactCommon/react/renderer/components/image/ImageState.h | 2 +-
 .../react/renderer/components/image/React/Image.h            | 5 -----
 6 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h
index a4311bb1a418..7fea5923bae2 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <memory>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/ImageEventEmitter.h b/packages/react-native/ReactCommon/react/renderer/components/image/ImageEventEmitter.h
index 03f5da7c7f27..ac20b349e085 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/image/ImageEventEmitter.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/image/ImageEventEmitter.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <cstdint>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.h b/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.h
index e8a9be18cd6a..808f84db88d6 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <optional>
 #include <string>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/ImageShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/image/ImageShadowNode.h
index 97c2b752f494..e257778e4481 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/image/ImageShadowNode.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/image/ImageShadowNode.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <memory>
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/ImageState.h b/packages/react-native/ReactCommon/react/renderer/components/image/ImageState.h
index 249d6ad01bdb..41b3e39be620 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/image/ImageState.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/image/ImageState.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/cxxstableapi/UmbrellaGuard.h>
+#include <react/cxxstableapi/FrameworksGuard.h>
 
 #include <memory>
 #include <utility>
diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/React/Image.h b/packages/react-native/ReactCommon/react/renderer/components/image/React/Image.h
index f57ccab3a4e6..8bc35eee209a 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/image/React/Image.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/image/React/Image.h
@@ -31,11 +31,6 @@
 #undef RN_UMBRELLA_CONTEXT
 #define RN_UMBRELLA_CONTEXT 1
 
-#include <react/renderer/components/image/ImageComponentDescriptor.h>
-#include <react/renderer/components/image/ImageEventEmitter.h>
-#include <react/renderer/components/image/ImageProps.h>
-#include <react/renderer/components/image/ImageShadowNode.h>
-#include <react/renderer/components/image/ImageState.h>
 #include <react/renderer/components/image/conversions.h>
 
 #undef RN_UMBRELLA_CONTEXT