Skip to content

Commit 08eb985

Browse files
joevilchesfacebook-github-bot
authored andcommitted
Rename AbsolutePositioning errata (#42318)
Summary: X-link: facebook/yoga#1558 Pull Request resolved: #42318 AbsolutePositioning -> AbsolutePositioningCatchAll A bit more clear. This errata is for various issues with positioning absolute nodes. There really isn't a clear description as to what specifically this enables/disables, so I just opted to say "catch all" to indicate that this controls various bugs Reviewed By: NickGerleman Differential Revision: D52820117 fbshipit-source-id: 80b77832baf65e68e57ca523c418422dd346ef0f
1 parent dc2e552 commit 08eb985

File tree

5 files changed

+25
-24
lines changed

5 files changed

+25
-24
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
public enum YogaErrata {
1313
NONE(0),
1414
STRETCH_FLEX_BASIS(1),
15-
ABSOLUTE_POSITIONING(2),
15+
ABSOLUTE_POSITIONING_INCORRECT(2),
1616
ABSOLUTE_PERCENT_AGAINST_INNER_SIZE(4),
1717
ALL(2147483647),
1818
CLASSIC(2147483646);
@@ -31,7 +31,7 @@ public static YogaErrata fromInt(int value) {
3131
switch (value) {
3232
case 0: return NONE;
3333
case 1: return STRETCH_FLEX_BASIS;
34-
case 2: return ABSOLUTE_POSITIONING;
34+
case 2: return ABSOLUTE_POSITIONING_INCORRECT;
3535
case 4: return ABSOLUTE_PERCENT_AGAINST_INNER_SIZE;
3636
case 2147483647: return ALL;
3737
case 2147483646: return CLASSIC;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ const char* YGErrataToString(const YGErrata value) {
9595
return "none";
9696
case YGErrataStretchFlexBasis:
9797
return "stretch-flex-basis";
98-
case YGErrataAbsolutePositioning:
99-
return "absolute-positioning";
98+
case YGErrataAbsolutePositioningIncorrect:
99+
return "absolute-positioning-incorrect";
100100
case YGErrataAbsolutePercentAgainstInnerSize:
101101
return "absolute-percent-against-inner-size";
102102
case YGErrataAll:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ YG_ENUM_DECL(
5656
YGErrata,
5757
YGErrataNone = 0,
5858
YGErrataStretchFlexBasis = 1,
59-
YGErrataAbsolutePositioning = 2,
59+
YGErrataAbsolutePositioningIncorrect = 2,
6060
YGErrataAbsolutePercentAgainstInnerSize = 4,
6161
YGErrataAll = 2147483647,
6262
YGErrataClassic = 2147483646)

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

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -261,24 +261,25 @@ static void positionAbsoluteChild(
261261
const bool isMainAxis,
262262
const float containingBlockWidth,
263263
const float containingBlockHeight) {
264-
child->hasErrata(Errata::AbsolutePositioning) ? positionAbsoluteChildLegacy(
265-
containingNode,
266-
parent,
267-
child,
268-
direction,
269-
axis,
270-
isMainAxis,
271-
containingBlockWidth,
272-
containingBlockHeight)
273-
: positionAbsoluteChildImpl(
274-
containingNode,
275-
parent,
276-
child,
277-
direction,
278-
axis,
279-
isMainAxis,
280-
containingBlockWidth,
281-
containingBlockHeight);
264+
child->hasErrata(Errata::AbsolutePositioningIncorrect)
265+
? positionAbsoluteChildLegacy(
266+
containingNode,
267+
parent,
268+
child,
269+
direction,
270+
axis,
271+
isMainAxis,
272+
containingBlockWidth,
273+
containingBlockHeight)
274+
: positionAbsoluteChildImpl(
275+
containingNode,
276+
parent,
277+
child,
278+
direction,
279+
axis,
280+
isMainAxis,
281+
containingBlockWidth,
282+
containingBlockHeight);
282283
}
283284

284285
void layoutAbsoluteChild(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace facebook::yoga {
1818
enum class Errata : uint32_t {
1919
None = YGErrataNone,
2020
StretchFlexBasis = YGErrataStretchFlexBasis,
21-
AbsolutePositioning = YGErrataAbsolutePositioning,
21+
AbsolutePositioningIncorrect = YGErrataAbsolutePositioningIncorrect,
2222
AbsolutePercentAgainstInnerSize = YGErrataAbsolutePercentAgainstInnerSize,
2323
All = YGErrataAll,
2424
Classic = YGErrataClassic,

0 commit comments

Comments
 (0)