From 7936d90762f608702b78c080dc061ce31255d357 Mon Sep 17 00:00:00 2001
From: Petr Bela <bela.petr@gmail.com>
Date: Tue, 16 Sep 2025 13:43:39 +0200
Subject: [PATCH] fix FollyConvert.h for static frameworks

---
 ios/Sources/ObjcHelpers/RNIObjcUtils.mm           |  2 +-
 ios/Sources/RNIBaseView/RNIBaseView.mm            |  2 +-
 .../RNIUtilitiesModule/RNIUtilitiesFollyConvert.h | 15 +++++++++++++++
 .../RNIUtilitiesModule/RNIUtilitiesModule.mm      |  2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 ios/Sources/RNIUtilitiesModule/RNIUtilitiesFollyConvert.h

diff --git a/ios/Sources/ObjcHelpers/RNIObjcUtils.mm b/ios/Sources/ObjcHelpers/RNIObjcUtils.mm
index 7931a0e6..38f71a7f 100644
--- a/ios/Sources/ObjcHelpers/RNIObjcUtils.mm
+++ b/ios/Sources/ObjcHelpers/RNIObjcUtils.mm
@@ -19,7 +19,7 @@
 #if __cplusplus
 #import <folly/dynamic.h>
 #import <React/RCTConversions.h>
-#import <React/RCTFollyConvert.h>
+#import "RNIUtilitiesFollyConvert.h"
 
 #include <react/renderer/core/LayoutMetrics.h>
 #include <react/renderer/graphics/Rect.h>
diff --git a/ios/Sources/RNIBaseView/RNIBaseView.mm b/ios/Sources/RNIBaseView/RNIBaseView.mm
index 3ab197a5..7aeb0eb7 100644
--- a/ios/Sources/RNIBaseView/RNIBaseView.mm
+++ b/ios/Sources/RNIBaseView/RNIBaseView.mm
@@ -27,7 +27,7 @@
 
 #import "RCTFabricComponentsPlugins.h"
 
-#import <React/RCTFollyConvert.h>
+#import "RNIUtilitiesFollyConvert.h"
 #import <React/RCTSurfaceTouchHandler.h>
 
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
diff --git a/ios/Sources/RNIUtilitiesModule/RNIUtilitiesFollyConvert.h b/ios/Sources/RNIUtilitiesModule/RNIUtilitiesFollyConvert.h
new file mode 100644
index 00000000..bdf7ca90
--- /dev/null
+++ b/ios/Sources/RNIUtilitiesModule/RNIUtilitiesFollyConvert.h
@@ -0,0 +1,15 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#if __has_include(<react/utils/FollyConvert.h>)
+  // static libs / header maps (no use_frameworks!)
+  #import <react/utils/FollyConvert.h>
+#elif __has_include("FollyConvert.h")
+  // `use_frameworks! :linkage => :static` users will need to import FollyConvert this way
+  #import "FollyConvert.h"
+#elif __has_include("RCTFollyConvert.h")
+  #import "RCTFollyConvert.h"
+#else
+  #error "FollyConvert.h not found. Ensure React-utils & RCT-Folly pods are installed."
+#endif
+
+#endif
diff --git a/ios/Sources/RNIUtilitiesModule/RNIUtilitiesModule.mm b/ios/Sources/RNIUtilitiesModule/RNIUtilitiesModule.mm
index 097658fe..0e53f848 100644
--- a/ios/Sources/RNIUtilitiesModule/RNIUtilitiesModule.mm
+++ b/ios/Sources/RNIUtilitiesModule/RNIUtilitiesModule.mm
@@ -19,7 +19,7 @@
 
 #import <folly/dynamic.h>
 #import <React/RCTConversions.h>
-#import <React/RCTFollyConvert.h>
+#import "RNIUtilitiesFollyConvert.h"
 
 #include <jsi/jsi.h>
 #include <string>