From 86d04f8bc9c844a556ee6c7c29c608166ebfb861 Mon Sep 17 00:00:00 2001 From: Joe Vilches Date: Thu, 18 Jan 2024 21:22:05 -0800 Subject: [PATCH] Hardcode AbsolutePercentageAgainstPaddingEdge experimental feature to false (#42253) Summary: X-link: https://github.com/facebook/yoga/pull/1549 Pull Request resolved: https://github.com/facebook/react-native/pull/42253 This experimental feature is always false, and with the next diff I will be deleting the branch that actually calls into this. Separating this diff out to simplify the review process. Reviewed By: NickGerleman Differential Revision: D52705765 fbshipit-source-id: 705f4aa297eae730af9b44753eb01c9dec385dcf --- .../facebook/yoga/YogaExperimentalFeature.java | 4 +--- .../ReactCommon/yoga/yoga/YGEnums.cpp | 2 -- .../react-native/ReactCommon/yoga/yoga/YGEnums.h | 3 +-- .../yoga/yoga/algorithm/AbsoluteLayout.cpp | 15 --------------- .../yoga/yoga/algorithm/CalculateLayout.cpp | 11 ++--------- .../yoga/yoga/enums/ExperimentalFeature.h | 3 +-- 6 files changed, 5 insertions(+), 33 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java index a9e621ef5a7..3fabbb91729 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java @@ -10,8 +10,7 @@ package com.facebook.yoga; public enum YogaExperimentalFeature { - WEB_FLEX_BASIS(0), - ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE(1); + WEB_FLEX_BASIS(0); private final int mIntValue; @@ -26,7 +25,6 @@ public enum YogaExperimentalFeature { public static YogaExperimentalFeature fromInt(int value) { switch (value) { case 0: return WEB_FLEX_BASIS; - case 1: return ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE; default: throw new IllegalArgumentException("Unknown enum value: " + value); } } diff --git a/packages/react-native/ReactCommon/yoga/yoga/YGEnums.cpp b/packages/react-native/ReactCommon/yoga/yoga/YGEnums.cpp index fcc4e9af718..7884be1a699 100644 --- a/packages/react-native/ReactCommon/yoga/yoga/YGEnums.cpp +++ b/packages/react-native/ReactCommon/yoga/yoga/YGEnums.cpp @@ -111,8 +111,6 @@ const char* YGExperimentalFeatureToString(const YGExperimentalFeature value) { switch (value) { case YGExperimentalFeatureWebFlexBasis: return "web-flex-basis"; - case YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge: - return "absolute-percentage-against-padding-edge"; } return "unknown"; } diff --git a/packages/react-native/ReactCommon/yoga/yoga/YGEnums.h b/packages/react-native/ReactCommon/yoga/yoga/YGEnums.h index 658744aa37c..835b7b697b1 100644 --- a/packages/react-native/ReactCommon/yoga/yoga/YGEnums.h +++ b/packages/react-native/ReactCommon/yoga/yoga/YGEnums.h @@ -64,8 +64,7 @@ YG_DEFINE_ENUM_FLAG_OPERATORS(YGErrata) YG_ENUM_DECL( YGExperimentalFeature, - YGExperimentalFeatureWebFlexBasis, - YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge) + YGExperimentalFeatureWebFlexBasis) YG_ENUM_DECL( YGFlexDirection, diff --git a/packages/react-native/ReactCommon/yoga/yoga/algorithm/AbsoluteLayout.cpp b/packages/react-native/ReactCommon/yoga/yoga/algorithm/AbsoluteLayout.cpp index 230dfb5d25b..8055c86252a 100644 --- a/packages/react-native/ReactCommon/yoga/yoga/algorithm/AbsoluteLayout.cpp +++ b/packages/react-native/ReactCommon/yoga/yoga/algorithm/AbsoluteLayout.cpp @@ -178,21 +178,6 @@ static void positionAbsoluteChildLegacy( (parent->getLayout().measuredDimension(dimension(axis)) - child->getLayout().measuredDimension(dimension(axis))), flexStartEdge(axis)); - } else if ( - parent->getConfig()->isExperimentalFeatureEnabled( - ExperimentalFeature::AbsolutePercentageAgainstPaddingEdge) && - child->isFlexStartPositionDefined(axis, direction)) { - child->setLayoutPosition( - child->getFlexStartPosition( - axis, - direction, - containingNode->getLayout().measuredDimension(dimension(axis))) + - containingNode->getFlexStartBorder(axis, direction) + - child->getFlexStartMargin( - axis, - direction, - isAxisRow ? containingBlockWidth : containingBlockHeight), - flexStartEdge(axis)); } } diff --git a/packages/react-native/ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp b/packages/react-native/ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp index a3564f33b7c..54e781668d5 100644 --- a/packages/react-native/ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp +++ b/packages/react-native/ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp @@ -2048,20 +2048,13 @@ static void calculateLayoutImpl( child->getStyle().positionType() != PositionType::Absolute) { continue; } - const bool absolutePercentageAgainstPaddingEdge = - node->getConfig()->isExperimentalFeatureEnabled( - ExperimentalFeature::AbsolutePercentageAgainstPaddingEdge); layoutAbsoluteChild( node, node, child, - absolutePercentageAgainstPaddingEdge - ? node->getLayout().measuredDimension(Dimension::Width) - : availableInnerWidth, - absolutePercentageAgainstPaddingEdge - ? node->getLayout().measuredDimension(Dimension::Height) - : availableInnerHeight, + availableInnerWidth, + availableInnerHeight, isMainAxisRow ? sizingModeMainDim : sizingModeCrossDim, direction, layoutMarkerData, diff --git a/packages/react-native/ReactCommon/yoga/yoga/enums/ExperimentalFeature.h b/packages/react-native/ReactCommon/yoga/yoga/enums/ExperimentalFeature.h index 4c366fb43ed..bbbf9cda431 100644 --- a/packages/react-native/ReactCommon/yoga/yoga/enums/ExperimentalFeature.h +++ b/packages/react-native/ReactCommon/yoga/yoga/enums/ExperimentalFeature.h @@ -17,12 +17,11 @@ namespace facebook::yoga { enum class ExperimentalFeature : uint8_t { WebFlexBasis = YGExperimentalFeatureWebFlexBasis, - AbsolutePercentageAgainstPaddingEdge = YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge, }; template <> constexpr int32_t ordinalCount() { - return 2; + return 1; } constexpr ExperimentalFeature scopedEnum(YGExperimentalFeature unscoped) {