Simplify Edge Resolution

packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaErrata.java

@@ -12,9 +12,8 @@
 public enum YogaErrata {
   NONE(0),
   STRETCH_FLEX_BASIS(1),
-  STARTING_ENDING_EDGE_FROM_FLEX_DIRECTION(2),
-  POSITION_STATIC_BEHAVES_LIKE_RELATIVE(4),
-  ABSOLUTE_POSITIONING(8),
+  POSITION_STATIC_BEHAVES_LIKE_RELATIVE(2),
+  ABSOLUTE_POSITIONING(4),
   ALL(2147483647),
   CLASSIC(2147483646);
 
@@ -32,9 +31,8 @@ public static YogaErrata fromInt(int value) {
     switch (value) {
       case 0: return NONE;
       case 1: return STRETCH_FLEX_BASIS;
-      case 2: return STARTING_ENDING_EDGE_FROM_FLEX_DIRECTION;
-      case 4: return POSITION_STATIC_BEHAVES_LIKE_RELATIVE;
-      case 8: return ABSOLUTE_POSITIONING;
+      case 2: return POSITION_STATIC_BEHAVES_LIKE_RELATIVE;
+      case 4: return ABSOLUTE_POSITIONING;
       case 2147483647: return ALL;
       case 2147483646: return CLASSIC;
       default: throw new IllegalArgumentException("Unknown enum value: " + value);

packages/react-native/ReactCommon/yoga/yoga/YGEnums.cpp

@@ -95,8 +95,6 @@ const char* YGErrataToString(const YGErrata value) {
       return "none";
     case YGErrataStretchFlexBasis:
       return "stretch-flex-basis";
-    case YGErrataStartingEndingEdgeFromFlexDirection:
-      return "starting-ending-edge-from-flex-direction";
     case YGErrataPositionStaticBehavesLikeRelative:
       return "position-static-behaves-like-relative";
     case YGErrataAbsolutePositioning:

packages/react-native/ReactCommon/yoga/yoga/YGEnums.h

@@ -56,9 +56,8 @@ YG_ENUM_DECL(
     YGErrata,
     YGErrataNone = 0,
     YGErrataStretchFlexBasis = 1,
-    YGErrataStartingEndingEdgeFromFlexDirection = 2,
-    YGErrataPositionStaticBehavesLikeRelative = 4,
-    YGErrataAbsolutePositioning = 8,
+    YGErrataPositionStaticBehavesLikeRelative = 2,
+    YGErrataAbsolutePositioning = 4,
     YGErrataAll = 2147483647,
     YGErrataClassic = 2147483646)
 YG_DEFINE_ENUM_FLAG_OPERATORS(YGErrata)

packages/react-native/ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp

@@ -920,13 +920,9 @@ static void justifyMainAxis(
   const auto& style = node->getStyle();
 
   const float leadingPaddingAndBorderMain =
-      node->hasErrata(Errata::StartingEndingEdgeFromFlexDirection)
-      ? node->getInlineStartPaddingAndBorder(mainAxis, direction, ownerWidth)
-      : node->getFlexStartPaddingAndBorder(mainAxis, direction, ownerWidth);
+      node->getFlexStartPaddingAndBorder(mainAxis, direction, ownerWidth);
   const float trailingPaddingAndBorderMain =
-      node->hasErrata(Errata::StartingEndingEdgeFromFlexDirection)
-      ? node->getInlineEndPaddingAndBorder(mainAxis, direction, ownerWidth)
-      : node->getFlexEndPaddingAndBorder(mainAxis, direction, ownerWidth);
+      node->getFlexEndPaddingAndBorder(mainAxis, direction, ownerWidth);
 
   const float gap = node->getGapForAxis(mainAxis);
   // If we are using "at most" rules in the main axis, make sure that

packages/react-native/ReactCommon/yoga/yoga/algorithm/FlexDirection.h

@@ -99,32 +99,6 @@ inline Edge inlineEndEdge(
   return Edge::Bottom;
 }
 
-/**
- * The physical edges that Edge::Start and Edge::End correspond to (e.g.
- * left/right) are soley dependent on the direction. However, there are cases
- * where we want the flex start/end edge (i.e. which edge is the start/end
- * for laying out flex items), which can be distinct from the corresponding
- * inline edge. In these cases we need to know which "relative edge"
- * (Edge::Start/Edge::End) corresponds to the said flex start/end edge as these
- * relative edges can be used instead of physical ones when defining certain
- * attributes like border or padding.
- */
-inline Edge flexStartRelativeEdge(
-    FlexDirection flexDirection,
-    Direction direction) {
-  const Edge leadLayoutEdge = inlineStartEdge(flexDirection, direction);
-  const Edge leadFlexItemEdge = flexStartEdge(flexDirection);
-  return leadLayoutEdge == leadFlexItemEdge ? Edge::Start : Edge::End;
-}
-
-inline Edge flexEndRelativeEdge(
-    FlexDirection flexDirection,
-    Direction direction) {
-  const Edge trailLayoutEdge = inlineEndEdge(flexDirection, direction);
-  const Edge trailFlexItemEdge = flexEndEdge(flexDirection);
-  return trailLayoutEdge == trailFlexItemEdge ? Edge::End : Edge::Start;
-}
-
 inline Dimension dimension(const FlexDirection flexDirection) {
   switch (flexDirection) {
     case FlexDirection::Column:

packages/react-native/ReactCommon/yoga/yoga/enums/Errata.h

@@ -18,7 +18,6 @@ namespace facebook::yoga {
 enum class Errata : uint32_t {
   None = YGErrataNone,
   StretchFlexBasis = YGErrataStretchFlexBasis,
-  StartingEndingEdgeFromFlexDirection = YGErrataStartingEndingEdgeFromFlexDirection,
   PositionStaticBehavesLikeRelative = YGErrataPositionStaticBehavesLikeRelative,
   AbsolutePositioning = YGErrataAbsolutePositioning,
   All = YGErrataAll,