C++ style enums 13/N: Wrap (facebook#1400)

Summary: X-link: facebook/react-native#39539 Pull Request resolved: facebook#1400 Moves internal usages of YGPositionType to PositionType Changelog: [Internal] Reviewed By: rshest Differential Revision: D49361746 fbshipit-source-id: 4e4da358c6c1a53b0b6c2e987616fd6aebfce5bd
NickGerleman · Sep 19, 2023 · c3dbfda · c3dbfda
1 parent f7d8f11
commit c3dbfda
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 19 deletions.
diff --git a/tests/YGStyleAccessorsTest.cpp b/tests/YGStyleAccessorsTest.cpp
@@ -135,12 +135,7 @@ ACCESSOR_TEST(
     PositionType::Absolute,
     PositionType::Relative)
 
-ACCESSOR_TEST(
-    flexWrap,
-    YGWrapNoWrap,
-    YGWrapWrap,
-    YGWrapWrapReverse,
-    YGWrapNoWrap)
+ACCESSOR_TEST(flexWrap, Wrap::NoWrap, Wrap::Wrap, Wrap::WrapReverse)
 
 ACCESSOR_TEST(
     overflow,

diff --git a/yoga/Yoga.cpp b/yoga/Yoga.cpp
@@ -492,10 +492,11 @@ YGPositionType YGNodeStyleGetPositionType(const YGNodeConstRef node) {
 }
 
 void YGNodeStyleSetFlexWrap(const YGNodeRef node, const YGWrap flexWrap) {
-  updateStyle<MSVC_HINT(flexWrap)>(node, &Style::flexWrap, flexWrap);
+  updateStyle<MSVC_HINT(flexWrap)>(
+      node, &Style::flexWrap, scopedEnum(flexWrap));
 }
 YGWrap YGNodeStyleGetFlexWrap(const YGNodeConstRef node) {
-  return resolveRef(node)->getStyle().flexWrap();
+  return unscopedEnum(resolveRef(node)->getStyle().flexWrap());
 }
 
 void YGNodeStyleSetOverflow(const YGNodeRef node, const YGOverflow overflow) {

diff --git a/yoga/algorithm/CalculateLayout.cpp b/yoga/algorithm/CalculateLayout.cpp
@@ -520,7 +520,7 @@ static void layoutAbsoluteChild(
   } else if (
       !child->isLeadingPositionDefined(crossAxis) &&
       ((resolveChildAlignment(node, child) == Align::FlexEnd) ^
-       (node->getStyle().flexWrap() == YGWrapWrapReverse))) {
+       (node->getStyle().flexWrap() == Wrap::WrapReverse))) {
     child->setLayoutPosition(
         (node->getLayout().measuredDimensions[dimension(crossAxis)] -
          child->getLayout().measuredDimensions[dimension(crossAxis)]),
@@ -877,7 +877,7 @@ static float distributeFreeSpaceSecondPass(
   float flexGrowFactor = 0;
   float deltaFreeSpace = 0;
   const bool isMainAxisRow = isRow(mainAxis);
-  const bool isNodeFlexWrap = node->getStyle().flexWrap() != YGWrapNoWrap;
+  const bool isNodeFlexWrap = node->getStyle().flexWrap() != Wrap::NoWrap;
 
   for (auto currentLineChild : flexLine.itemsInFlow) {
     childFlexBasis = boundAxisWithinMinAndMax(
@@ -1604,7 +1604,7 @@ static void calculateLayoutImpl(
       resolveDirection(node->getStyle().flexDirection(), direction);
   const FlexDirection crossAxis = resolveCrossDirection(mainAxis, direction);
   const bool isMainAxisRow = isRow(mainAxis);
-  const bool isNodeFlexWrap = node->getStyle().flexWrap() != YGWrapNoWrap;
+  const bool isNodeFlexWrap = node->getStyle().flexWrap() != Wrap::NoWrap;
 
   const float mainAxisownerSize = isMainAxisRow ? ownerWidth : ownerHeight;
   const float crossAxisownerSize = isMainAxisRow ? ownerHeight : ownerWidth;
@@ -2302,7 +2302,7 @@ static void calculateLayoutImpl(
 
   // As we only wrapped in normal direction yet, we need to reverse the
   // positions on wrap-reverse.
-  if (performLayout && node->getStyle().flexWrap() == YGWrapWrapReverse) {
+  if (performLayout && node->getStyle().flexWrap() == Wrap::WrapReverse) {
     for (size_t i = 0; i < childCount; i++) {
       const auto child = node->getChild(i);
       if (child->getStyle().positionType() != PositionType::Absolute) {

diff --git a/yoga/algorithm/FlexLine.cpp b/yoga/algorithm/FlexLine.cpp
@@ -32,7 +32,7 @@ FlexLine calculateFlexLine(
   float sizeConsumedIncludingMinConstraint = 0;
   const FlexDirection mainAxis = resolveDirection(
       node->getStyle().flexDirection(), node->resolveDirection(ownerDirection));
-  const bool isNodeFlexWrap = node->getStyle().flexWrap() != YGWrapNoWrap;
+  const bool isNodeFlexWrap = node->getStyle().flexWrap() != Wrap::NoWrap;
   const float gap = node->getGapForAxis(mainAxis, availableInnerWidth).unwrap();
 
   // Add items to the current line until it's full or we run out of items.

diff --git a/yoga/debug/NodeToString.cpp b/yoga/debug/NodeToString.cpp
@@ -166,8 +166,7 @@ void nodeToString(
     appendFloatOptionalIfDefined(str, "flex", style.flex());
 
     if (style.flexWrap() != yoga::Node{}.getStyle().flexWrap()) {
-      appendFormattedString(
-          str, "flex-wrap: %s; ", YGWrapToString(style.flexWrap()));
+      appendFormattedString(str, "flex-wrap: %s; ", toString(style.flexWrap()));
     }
 
     if (style.overflow() != yoga::Node{}.getStyle().overflow()) {

diff --git a/yoga/style/Style.h b/yoga/style/Style.h
@@ -20,6 +20,7 @@
 #include <yoga/enums/FlexDirection.h>
 #include <yoga/enums/Justify.h>
 #include <yoga/enums/PositionType.h>
+#include <yoga/enums/Wrap.h>
 #include <yoga/numeric/FloatOptional.h>
 #include <yoga/style/CompactValue.h>
 
@@ -119,7 +120,7 @@ class YG_EXPORT Style {
   static constexpr uint8_t flexWrapOffset =
       positionTypeOffset + minimumBitCount<PositionType>();
   static constexpr uint8_t overflowOffset =
-      flexWrapOffset + minimumBitCount<YGWrap>();
+      flexWrapOffset + minimumBitCount<Wrap>();
   static constexpr uint8_t displayOffset =
       overflowOffset + minimumBitCount<YGOverflow>();
 
@@ -193,10 +194,10 @@ class YG_EXPORT Style {
     return {*this, positionTypeOffset};
   }
 
-  YGWrap flexWrap() const {
-    return getEnumData<YGWrap>(flags, flexWrapOffset);
+  Wrap flexWrap() const {
+    return getEnumData<Wrap>(flags, flexWrapOffset);
   }
-  BitfieldRef<YGWrap> flexWrap() {
+  BitfieldRef<Wrap> flexWrap() {
     return {*this, flexWrapOffset};
   }