Change to C function

zhongwuzw · Apr 9, 2024 · a6e5702 · a6e5702
1 parent 383d77f
commit a6e5702
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 7 deletions.
diff --git a/packages/react-native/React/React-RCTFabric.podspec b/packages/react-native/React/React-RCTFabric.podspec
@@ -77,6 +77,7 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-Fabric", :additional_framework_paths => [
     "react/renderer/textlayoutmanager/platform/ios",
     "react/renderer/components/textinput/platform/ios",
+    "react/renderer/components/modal/platform/ios",
     "react/renderer/components/view/platform/cxx",
     "react/renderer/imagemanager/platform/ios",
   ])

diff --git a/packages/react-native/ReactCommon/React-Fabric.podspec b/packages/react-native/ReactCommon/React-Fabric.podspec
@@ -101,6 +101,7 @@ Pod::Spec.new do |s|
       header_search_path = header_search_path + [
         "\"$(PODS_TARGET_SRCROOT)/react/renderer/textlayoutmanager/platform/ios\"",
         "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/textinput/platform/ios\"",
+        "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/modal/platform/ios\"",
         "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/view/platform/cxx\"",
       ]
     end

diff --git a/packages/react-native/ReactCommon/React-FabricImage.podspec b/packages/react-native/ReactCommon/React-FabricImage.podspec
@@ -38,6 +38,7 @@ if ENV['USE_FRAMEWORKS']
     "\"$(PODS_TARGET_SRCROOT)\"",
     "\"$(PODS_TARGET_SRCROOT)/react/renderer/textlayoutmanager/platform/ios\"",
     "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/textinput/platform/ios\"",
+    "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/modal/platform/ios\"",
     # "\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCodegen/ReactCodegen.framework/Headers\"",
   ]
 end

diff --git a/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewState.h b/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewState.h
@@ -30,7 +30,11 @@ class ModalHostViewState final {
   using Shared = std::shared_ptr<const ModalHostViewState>;
 
 #if defined(__APPLE__) && TARGET_OS_IOS
-  ModalHostViewState() : screenSize(RCTModalHostViewScreenSize()) {
+  static Size getScreenSize() {
+    auto screenSize = RCTModalHostViewScreenSize();
+    return {screenSize.width, screenSize.height};
+  }
+  ModalHostViewState() : screenSize(getScreenSize()) {
 #else
   ModalHostViewState(){
 #endif

diff --git a/...rer/components/modal/ModalHostViewUtils.h → ...rer/components/modal/ModalHostViewUtils.h b/...rer/components/modal/ModalHostViewUtils.h → ...rer/components/modal/ModalHostViewUtils.h
@@ -7,10 +7,17 @@
 
 #pragma once
 
-#include <react/renderer/core/graphicsConversions.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-namespace facebook::react {
+typedef struct {
+  CGFloat width;
+  CGFloat height;
+} RCTSize;
 
-Size RCTModalHostViewScreenSize(void);
+RCTSize RCTModalHostViewScreenSize(void);
 
-} // namespace facebook::react
+#ifdef __cplusplus
+}
+#endif
diff --git a/...er/components/modal/ModalHostViewUtils.mm → ...er/components/modal/ModalHostViewUtils.mm b/...er/components/modal/ModalHostViewUtils.mm → ...er/components/modal/ModalHostViewUtils.mm
@@ -9,11 +9,12 @@
 #import <Foundation/Foundation.h>
 #import <React/RCTUtils.h>
 
-namespace facebook::react {
+extern "C" {
 
-Size RCTModalHostViewScreenSize(void)
+RCTSize RCTModalHostViewScreenSize(void)
 {
   CGSize screenSize = RCTScreenSize();
+
   return {screenSize.width, screenSize.height};
 }