From fc81f52f8db8fd6dab5bd485fde26beb49ad5842 Mon Sep 17 00:00:00 2001
From: Jakub Piasecki <piaseckijakub@meta.com>
Date: Mon, 12 Oct 2026 23:36:42 -0700
Subject: [PATCH] Use umbrellas in popup-menu-android generated headers
 (#58906)

Summary:

Refresh the checked-in codegen headers of `react-native-popup-menu-android` to include React Native through module umbrellas instead of fine-grained headers, matching current codegen output. Each umbrella re-exports the headers it replaces, so there is no functional change.

Changelog: [Internal]

Differential Revision: D123850428
---
 .../android/src/main/jni/ReactPopupMenuAndroidSpecs.h          | 3 +--
 .../ReactPopupMenuAndroidSpecs/ComponentDescriptors.h          | 2 +-
 .../renderer/components/ReactPopupMenuAndroidSpecs/Props.h     | 2 +-
 .../renderer/components/ReactPopupMenuAndroidSpecs/States.h    | 3 +--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/react-native-popup-menu-android/android/src/main/jni/ReactPopupMenuAndroidSpecs.h b/packages/react-native-popup-menu-android/android/src/main/jni/ReactPopupMenuAndroidSpecs.h
index 251fb6983bfe..384cbf3bda56 100644
--- a/packages/react-native-popup-menu-android/android/src/main/jni/ReactPopupMenuAndroidSpecs.h
+++ b/packages/react-native-popup-menu-android/android/src/main/jni/ReactPopupMenuAndroidSpecs.h
@@ -10,8 +10,7 @@
 
 #pragma once
 
-#include <ReactCommon/JavaTurboModule.h>
-#include <ReactCommon/TurboModule.h>
+#include <React/NativeModuleCore.h>
 #include <jsi/jsi.h>
 
 namespace facebook::react {
diff --git a/packages/react-native-popup-menu-android/android/src/main/jni/react/renderer/components/ReactPopupMenuAndroidSpecs/ComponentDescriptors.h b/packages/react-native-popup-menu-android/android/src/main/jni/react/renderer/components/ReactPopupMenuAndroidSpecs/ComponentDescriptors.h
index b89a3e123540..e3632d87009d 100644
--- a/packages/react-native-popup-menu-android/android/src/main/jni/react/renderer/components/ReactPopupMenuAndroidSpecs/ComponentDescriptors.h
+++ b/packages/react-native-popup-menu-android/android/src/main/jni/react/renderer/components/ReactPopupMenuAndroidSpecs/ComponentDescriptors.h
@@ -12,7 +12,7 @@
 
 #include "ShadowNodes.h"
 #include <React/ComponentRegistry.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <React/RendererCore.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native-popup-menu-android/android/src/main/jni/react/renderer/components/ReactPopupMenuAndroidSpecs/Props.h b/packages/react-native-popup-menu-android/android/src/main/jni/react/renderer/components/ReactPopupMenuAndroidSpecs/Props.h
index 981090716949..76eceafba376 100644
--- a/packages/react-native-popup-menu-android/android/src/main/jni/react/renderer/components/ReactPopupMenuAndroidSpecs/Props.h
+++ b/packages/react-native-popup-menu-android/android/src/main/jni/react/renderer/components/ReactPopupMenuAndroidSpecs/Props.h
@@ -9,8 +9,8 @@
  */
 #pragma once
 
+#include <React/RendererCore.h>
 #include <React/View.h>
-#include <react/renderer/core/PropsParserContext.h>
 #include <vector>
 
 namespace facebook::react {
diff --git a/packages/react-native-popup-menu-android/android/src/main/jni/react/renderer/components/ReactPopupMenuAndroidSpecs/States.h b/packages/react-native-popup-menu-android/android/src/main/jni/react/renderer/components/ReactPopupMenuAndroidSpecs/States.h
index de97a8fb38e4..457ed54872fe 100644
--- a/packages/react-native-popup-menu-android/android/src/main/jni/react/renderer/components/ReactPopupMenuAndroidSpecs/States.h
+++ b/packages/react-native-popup-menu-android/android/src/main/jni/react/renderer/components/ReactPopupMenuAndroidSpecs/States.h
@@ -10,8 +10,7 @@
 
 #ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
-#include <react/renderer/mapbuffer/MapBuffer.h>
-#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+#include <React/MapBuffer.h>
 #endif
 
 namespace facebook::react {