C++ style enums 9/N: FlexDirection (facebook#39484)

Summary: X-link: facebook/yoga#1394 Pull Request resolved: facebook#39484 Moves internal usages of YGDirection to Direction. Changelog: [Internal] Differential Revision: D49336066 fbshipit-source-id: 0798a0b5a63c4e4c95d426b15f5be12ce69dfe1d
NickGerleman · Sep 18, 2023 · cb75467 · cb75467
1 parent bcfc41d
commit cb75467
Show file tree

Hide file tree

Showing 13 changed files with 178 additions and 175 deletions.
diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/conversions.h b/packages/react-native/ReactCommon/react/renderer/components/view/conversions.h
@@ -193,30 +193,30 @@ inline void fromRawValue(
 inline void fromRawValue(
     const PropsParserContext& context,
     const RawValue& value,
-    YGFlexDirection& result) {
-  result = YGFlexDirectionColumn;
+    yoga::FlexDirection& result) {
+  result = yoga::FlexDirection::Column;
   react_native_expect(value.hasType<std::string>());
   if (!value.hasType<std::string>()) {
     return;
   }
   auto stringValue = (std::string)value;
   if (stringValue == "row") {
-    result = YGFlexDirectionRow;
+    result = yoga::FlexDirection::Row;
     return;
   }
   if (stringValue == "column") {
-    result = YGFlexDirectionColumn;
+    result = yoga::FlexDirection::Column;
     return;
   }
   if (stringValue == "column-reverse") {
-    result = YGFlexDirectionColumnReverse;
+    result = yoga::FlexDirection::ColumnReverse;
     return;
   }
   if (stringValue == "row-reverse") {
-    result = YGFlexDirectionRowReverse;
+    result = yoga::FlexDirection::RowReverse;
     return;
   }
-  LOG(ERROR) << "Could not parse YGFlexDirection:" << stringValue;
+  LOG(ERROR) << "Could not parse yoga::FlexDirection:" << stringValue;
   react_native_expect(false);
 }
 
@@ -754,15 +754,15 @@ inline std::string toString(const yoga::Direction& value) {
   }
 }
 
-inline std::string toString(const YGFlexDirection& value) {
+inline std::string toString(const yoga::FlexDirection& value) {
   switch (value) {
-    case YGFlexDirectionColumn:
+    case yoga::FlexDirection::Column:
       return "column";
-    case YGFlexDirectionColumnReverse:
+    case yoga::FlexDirection::ColumnReverse:
       return "column-reverse";
-    case YGFlexDirectionRow:
+    case yoga::FlexDirection::Row:
       return "row";
-    case YGFlexDirectionRowReverse:
+    case yoga::FlexDirection::RowReverse:
       return "row-reverse";
   }
 }

diff --git a/...components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp b/...components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp
@@ -121,7 +121,7 @@ void HostPlatformViewProps::setProp(
 
 bool HostPlatformViewProps::getProbablyMoreHorizontalThanVertical_DEPRECATED()
     const {
-  return yogaStyle.flexDirection() == YGFlexDirectionRow;
+  return yogaStyle.flexDirection() == yoga::FlexDirection::Row;
 }
 
 #if RN_DEBUG_STRING_CONVERTIBLE

diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/tests/ViewTest.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/tests/ViewTest.cpp
@@ -53,7 +53,7 @@ class YogaDirtyFlagTest : public ::testing::Test {
                     props.nativeId = "native Id";
                     props.opacity = 0.5;
                     props.yogaStyle.alignContent() = YGAlignBaseline;
-                    props.yogaStyle.flexDirection() = YGFlexDirectionRowReverse;
+                    props.yogaStyle.flexDirection() = yoga::FlexDirection::RowReverse;
                     return mutableViewProps;
                   }),
                 Element<ViewShadowNode>()

diff --git a/packages/react-native/ReactCommon/yoga/Yoga.podspec b/packages/react-native/ReactCommon/yoga/Yoga.podspec
@@ -60,4 +60,5 @@ Pod::Spec.new do |spec|
   all_header_files = 'yoga/**/*.h'
   all_header_files = File.join('ReactCommon/yoga', all_header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
   spec.private_header_files = Dir.glob(all_header_files) - Dir.glob(public_header_files)
+  spec.preserve_paths = [all_header_files]
 end
diff --git a/packages/react-native/ReactCommon/yoga/yoga/Yoga.cpp b/packages/react-native/ReactCommon/yoga/yoga/Yoga.cpp
@@ -439,10 +439,10 @@ void YGNodeStyleSetFlexDirection(
     const YGNodeRef node,
     const YGFlexDirection flexDirection) {
   updateStyle<MSVC_HINT(flexDirection)>(
-      node, &Style::flexDirection, flexDirection);
+      node, &Style::flexDirection, scopedEnum(flexDirection));
 }
 YGFlexDirection YGNodeStyleGetFlexDirection(const YGNodeConstRef node) {
-  return resolveRef(node)->getStyle().flexDirection();
+  return unscopedEnum(resolveRef(node)->getStyle().flexDirection());
 }
 
 void YGNodeStyleSetJustifyContent(

diff --git a/packages/react-native/ReactCommon/yoga/yoga/algorithm/BoundAxis.h b/packages/react-native/ReactCommon/yoga/yoga/algorithm/BoundAxis.h
@@ -9,6 +9,7 @@
 
 #include <yoga/algorithm/FlexDirection.h>
 #include <yoga/algorithm/ResolveValue.h>
+#include <yoga/enums/FlexDirection.h>
 #include <yoga/node/Node.h>
 #include <yoga/numeric/Comparison.h>
 #include <yoga/numeric/FloatOptional.h>
@@ -17,7 +18,7 @@ namespace facebook::yoga {
 
 inline float paddingAndBorderForAxis(
     const yoga::Node* const node,
-    const YGFlexDirection axis,
+    const FlexDirection axis,
     const float widthSize) {
   return (node->getLeadingPaddingAndBorder(axis, widthSize) +
           node->getTrailingPaddingAndBorder(axis, widthSize))
@@ -26,7 +27,7 @@ inline float paddingAndBorderForAxis(
 
 inline FloatOptional boundAxisWithinMinAndMax(
     const yoga::Node* const node,
-    const YGFlexDirection axis,
+    const FlexDirection axis,
     const FloatOptional value,
     const float axisSize) {
   FloatOptional min;
@@ -59,7 +60,7 @@ inline FloatOptional boundAxisWithinMinAndMax(
 // go below the padding and border amount.
 inline float boundAxis(
     const yoga::Node* const node,
-    const YGFlexDirection axis,
+    const FlexDirection axis,
     const float value,
     const float axisSize,
     const float widthSize) {