Prepare to break the Dependency Cycle between React-graphics and Reac…

…t-Fabric (#36385) Summary: Pull Request resolved: #36385 This change moves the `graphics/conversions.h` files from `ReactCommon/react/renderer/graphics` to `ReactCommon/react/renderer/core`, renaming it to `graphicsConversions.h`. This is required because React-Fabric imports graphics, but graphics imports React-Fabric due to this file. The change would be breaking, but we don't want to break the ecosystem without even a warning. So, we put back the `conversions.h` file, which now just `include` the new one and outputs a warning when building. This actually maintain the dep cycle for the current version, but at least users are warned. ## Changelog: [iOS][Deprecated] - Deprecate the `ReactCommon/react/renderer/graphics/conversions.h` in favor of `ReactCommon/react/core/graphicsConversions.h` Reviewed By: cortinico, dmytrorykun Differential Revision: D43836261 fbshipit-source-id: ffe53a8ce2b0ea2dd1e1e5aaf6b3d3c5b57ad46d
facebook · Mar 8, 2023 · d72697c · d72697c
1 parent a055e07
commit d72697c
Show file tree

Hide file tree

Showing 20 changed files with 293 additions and 266 deletions.
diff --git a/ReactAndroid/src/main/jni/react/fabric/viewPropConversions.h b/ReactAndroid/src/main/jni/react/fabric/viewPropConversions.h
@@ -10,7 +10,7 @@
 #include <react/renderer/components/view/ViewProps.h>
 #include <react/renderer/components/view/ViewPropsMapBuffer.h>
 #include <react/renderer/components/view/conversions.h>
-#include <react/renderer/graphics/conversions.h>
+#include <react/renderer/core/graphicsConversions.h>
 #include <react/renderer/mapbuffer/MapBuffer.h>
 #include <react/renderer/mapbuffer/MapBufferBuilder.h>
 

diff --git a/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.cpp b/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.cpp
@@ -8,8 +8,8 @@
 #include "ParagraphAttributes.h"
 
 #include <react/renderer/attributedstring/conversions.h>
+#include <react/renderer/core/graphicsConversions.h>
 #include <react/renderer/debug/debugStringConvertibleUtils.h>
-#include <react/renderer/graphics/conversions.h>
 #include <react/utils/FloatComparison.h>
 
 namespace facebook::react {

diff --git a/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp b/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp
@@ -9,7 +9,7 @@
 
 #include <react/renderer/attributedstring/conversions.h>
 #include <react/renderer/core/conversions.h>
-#include <react/renderer/graphics/conversions.h>
+#include <react/renderer/core/graphicsConversions.h>
 #include <react/utils/FloatComparison.h>
 #include <cmath>
 

diff --git a/ReactCommon/react/renderer/attributedstring/conversions.h b/ReactCommon/react/renderer/attributedstring/conversions.h
@@ -19,8 +19,8 @@
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/core/conversions.h>
+#include <react/renderer/core/graphicsConversions.h>
 #include <react/renderer/core/propsConversions.h>
-#include <react/renderer/graphics/conversions.h>
 #include <cmath>
 
 #ifdef ANDROID

diff --git a/ReactCommon/react/renderer/attributedstring/tests/AttributedStringTest.cpp b/ReactCommon/react/renderer/attributedstring/tests/AttributedStringTest.cpp
@@ -9,7 +9,7 @@
 #include <react/renderer/attributedstring/TextAttributes.h>
 #include <react/renderer/attributedstring/conversions.h>
 #include <react/renderer/attributedstring/primitives.h>
-#include <react/renderer/graphics/conversions.h>
+#include <react/renderer/core/graphicsConversions.h>
 
 namespace facebook {
 namespace react {

diff --git a/ReactCommon/react/renderer/attributedstring/tests/TextAttributesTest.cpp b/ReactCommon/react/renderer/attributedstring/tests/TextAttributesTest.cpp
@@ -9,7 +9,7 @@
 #include <react/renderer/attributedstring/TextAttributes.h>
 #include <react/renderer/attributedstring/conversions.h>
 #include <react/renderer/attributedstring/primitives.h>
-#include <react/renderer/graphics/conversions.h>
+#include <react/renderer/core/graphicsConversions.h>
 
 namespace facebook {
 namespace react {

diff --git a/ReactCommon/react/renderer/components/image/conversions.h b/ReactCommon/react/renderer/components/image/conversions.h
@@ -12,7 +12,7 @@
 #include <glog/logging.h>
 #include <react/debug/react_native_expect.h>
 #include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/graphics/conversions.h>
+#include <react/renderer/core/graphicsConversions.h>
 #include <react/renderer/imagemanager/primitives.h>
 
 namespace facebook {

diff --git a/ReactCommon/react/renderer/components/inputaccessory/InputAccessoryState.h b/ReactCommon/react/renderer/components/inputaccessory/InputAccessoryState.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
+#include <react/renderer/core/graphicsConversions.h>
 #include <react/renderer/graphics/Float.h>
-#include <react/renderer/graphics/conversions.h>
 
 namespace facebook {
 namespace react {

diff --git a/ReactCommon/react/renderer/components/modal/ModalHostViewState.h b/ReactCommon/react/renderer/components/modal/ModalHostViewState.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
+#include <react/renderer/core/graphicsConversions.h>
 #include <react/renderer/graphics/Float.h>
-#include <react/renderer/graphics/conversions.h>
 
 #ifdef ANDROID
 #include <folly/dynamic.h>

diff --git a/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp b/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp
@@ -9,8 +9,8 @@
 
 #include <react/renderer/components/scrollview/conversions.h>
 #include <react/renderer/core/CoreFeatures.h>
+#include <react/renderer/core/graphicsConversions.h>
 #include <react/renderer/debug/debugStringConvertibleUtils.h>
-#include <react/renderer/graphics/conversions.h>
 
 #include <react/renderer/core/propsConversions.h>
 

diff --git a/ReactCommon/react/renderer/components/text/BaseTextProps.cpp b/ReactCommon/react/renderer/components/text/BaseTextProps.cpp
@@ -9,9 +9,9 @@
 
 #include <react/renderer/attributedstring/conversions.h>
 #include <react/renderer/core/CoreFeatures.h>
+#include <react/renderer/core/graphicsConversions.h>
 #include <react/renderer/core/propsConversions.h>
 #include <react/renderer/debug/DebugStringConvertibleItem.h>
-#include <react/renderer/graphics/conversions.h>
 
 namespace facebook::react {
 

diff --git a/...put/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp b/...put/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp
@@ -8,8 +8,8 @@
 #include "AndroidTextInputProps.h"
 #include <react/renderer/components/image/conversions.h>
 #include <react/renderer/core/CoreFeatures.h>
+#include <react/renderer/core/graphicsConversions.h>
 #include <react/renderer/core/propsConversions.h>
-#include <react/renderer/graphics/conversions.h>
 
 namespace facebook::react {
 

diff --git a/...mponents/textinput/iostextinput/react/renderer/components/iostextinput/TextInputProps.cpp b/...mponents/textinput/iostextinput/react/renderer/components/iostextinput/TextInputProps.cpp
@@ -9,8 +9,8 @@
 
 #include <react/renderer/attributedstring/conversions.h>
 #include <react/renderer/components/iostextinput/propsConversions.h>
+#include <react/renderer/core/graphicsConversions.h>
 #include <react/renderer/core/propsConversions.h>
-#include <react/renderer/graphics/conversions.h>
 
 namespace facebook::react {
 

diff --git a/ReactCommon/react/renderer/components/view/ViewProps.cpp b/ReactCommon/react/renderer/components/view/ViewProps.cpp
@@ -12,9 +12,9 @@
 #include <react/renderer/components/view/conversions.h>
 #include <react/renderer/components/view/propsConversions.h>
 #include <react/renderer/core/CoreFeatures.h>
+#include <react/renderer/core/graphicsConversions.h>
 #include <react/renderer/core/propsConversions.h>
 #include <react/renderer/debug/debugStringConvertibleUtils.h>
-#include <react/renderer/graphics/conversions.h>
 
 namespace facebook::react {
 

diff --git a/ReactCommon/react/renderer/components/view/ViewPropsMapBuffer.cpp b/ReactCommon/react/renderer/components/view/ViewPropsMapBuffer.cpp
@@ -12,7 +12,7 @@
 
 #include "viewPropConversions.h"
 
-#include <react/renderer/graphics/conversions.h>
+#include <react/renderer/core/graphicsConversions.h>
 #include <react/renderer/mapbuffer/MapBufferBuilder.h>
 
 namespace facebook {

diff --git a/ReactCommon/react/renderer/components/view/viewPropConversions.h b/ReactCommon/react/renderer/components/view/viewPropConversions.h
@@ -10,7 +10,7 @@
 #include <react/renderer/components/view/ViewProps.h>
 #include <react/renderer/components/view/ViewPropsMapBuffer.h>
 #include <react/renderer/components/view/conversions.h>
-#include <react/renderer/graphics/conversions.h>
+#include <react/renderer/core/graphicsConversions.h>
 #include <react/renderer/mapbuffer/MapBuffer.h>
 #include <react/renderer/mapbuffer/MapBufferBuilder.h>
 

diff --git a/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp b/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp
@@ -12,8 +12,8 @@
 #include <react/renderer/core/LayoutMetrics.h>
 #include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/core/TraitCast.h>
+#include <react/renderer/core/graphicsConversions.h>
 #include <react/renderer/debug/DebugStringConvertibleItem.h>
-#include <react/renderer/graphics/conversions.h>
 
 namespace facebook::react {