Skip to content

Commit

Permalink
Inline yoga::Style::Edges debugStringConvertibleItem (facebook#41609)
Browse files Browse the repository at this point in the history 
Summary:

Aggregate edges will no longer be exposed. Inline debugStringConvertibleItem string printing for it.

Previously included in D50998164

Changelog:
[Internal]

Reviewed By: joevilches

Differential Revision: D51510790
  • Loading branch information
@NickGerleman @facebook-github-bot
NickGerleman authored and facebook-github-bot committed Nov 22, 2023
1 parent 140b14b commit b2baeec
Show file tree
Hide file tree
Showing 2 changed files with 142 additions and 40 deletions.
144 changes: 140 additions & 4 deletions packages/react-native/ReactCommon/react/renderer/components/view/YogaStylableProps.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,13 +346,149 @@ SharedDebugStringConvertibleList YogaStylableProps::getDebugProps() const {
debugStringConvertibleItem(
"flexBasis", yogaStyle.flexBasis(), defaultYogaStyle.flexBasis()),
debugStringConvertibleItem(
"margin", yogaStyle.margin(), defaultYogaStyle.margin()),
"marginLeft",
yogaStyle.margin()[YGEdgeLeft],
defaultYogaStyle.margin()[YGEdgeLeft]),
debugStringConvertibleItem(
"position", yogaStyle.position(), defaultYogaStyle.position()),
"marginTop",
yogaStyle.margin()[YGEdgeTop],
defaultYogaStyle.margin()[YGEdgeTop]),
debugStringConvertibleItem(
"padding", yogaStyle.padding(), defaultYogaStyle.padding()),
"marginRight",
yogaStyle.margin()[YGEdgeRight],
defaultYogaStyle.margin()[YGEdgeRight]),
debugStringConvertibleItem(
"border", yogaStyle.border(), defaultYogaStyle.border()),
"marginBottom",
yogaStyle.margin()[YGEdgeBottom],
defaultYogaStyle.margin()[YGEdgeBottom]),
debugStringConvertibleItem(
"marginStart",
yogaStyle.margin()[YGEdgeStart],
defaultYogaStyle.margin()[YGEdgeStart]),
debugStringConvertibleItem(
"marginEnd",
yogaStyle.margin()[YGEdgeEnd],
defaultYogaStyle.margin()[YGEdgeEnd]),
debugStringConvertibleItem(
"marginHorizontal",
yogaStyle.margin()[YGEdgeHorizontal],
defaultYogaStyle.margin()[YGEdgeHorizontal]),
debugStringConvertibleItem(
"marginVertical",
yogaStyle.margin()[YGEdgeVertical],
defaultYogaStyle.margin()[YGEdgeVertical]),
debugStringConvertibleItem(
"margin",
yogaStyle.margin()[YGEdgeAll],
defaultYogaStyle.margin()[YGEdgeAll]),
debugStringConvertibleItem(
"left",
yogaStyle.position()[YGEdgeLeft],
defaultYogaStyle.position()[YGEdgeLeft]),
debugStringConvertibleItem(
"top",
yogaStyle.position()[YGEdgeTop],
defaultYogaStyle.position()[YGEdgeTop]),
debugStringConvertibleItem(
"right",
yogaStyle.position()[YGEdgeRight],
defaultYogaStyle.position()[YGEdgeRight]),
debugStringConvertibleItem(
"bottom",
yogaStyle.position()[YGEdgeBottom],
defaultYogaStyle.position()[YGEdgeBottom]),
debugStringConvertibleItem(
"start",
yogaStyle.position()[YGEdgeStart],
defaultYogaStyle.position()[YGEdgeStart]),
debugStringConvertibleItem(
"end",
yogaStyle.position()[YGEdgeEnd],
defaultYogaStyle.position()[YGEdgeEnd]),
debugStringConvertibleItem(
"inseInline",
yogaStyle.position()[YGEdgeHorizontal],
defaultYogaStyle.position()[YGEdgeHorizontal]),
debugStringConvertibleItem(
"insetBlock",
yogaStyle.position()[YGEdgeVertical],
defaultYogaStyle.position()[YGEdgeVertical]),
debugStringConvertibleItem(
"inset",
yogaStyle.position()[YGEdgeAll],
defaultYogaStyle.position()[YGEdgeAll]),
debugStringConvertibleItem(
"paddingLeft",
yogaStyle.padding()[YGEdgeLeft],
defaultYogaStyle.padding()[YGEdgeLeft]),
debugStringConvertibleItem(
"paddingTop",
yogaStyle.padding()[YGEdgeTop],
defaultYogaStyle.padding()[YGEdgeTop]),
debugStringConvertibleItem(
"paddingRight",
yogaStyle.padding()[YGEdgeRight],
defaultYogaStyle.padding()[YGEdgeRight]),
debugStringConvertibleItem(
"paddingBottom",
yogaStyle.padding()[YGEdgeBottom],
defaultYogaStyle.padding()[YGEdgeBottom]),
debugStringConvertibleItem(
"paddingStart",
yogaStyle.padding()[YGEdgeStart],
defaultYogaStyle.padding()[YGEdgeStart]),
debugStringConvertibleItem(
"paddingEnd",
yogaStyle.padding()[YGEdgeEnd],
defaultYogaStyle.padding()[YGEdgeEnd]),
debugStringConvertibleItem(
"paddingHorizontal",
yogaStyle.padding()[YGEdgeHorizontal],
defaultYogaStyle.padding()[YGEdgeHorizontal]),
debugStringConvertibleItem(
"paddingVertical",
yogaStyle.padding()[YGEdgeVertical],
defaultYogaStyle.padding()[YGEdgeVertical]),
debugStringConvertibleItem(
"padding",
yogaStyle.padding()[YGEdgeAll],
defaultYogaStyle.padding()[YGEdgeAll]),
debugStringConvertibleItem(
"borderLeftWidth",
yogaStyle.border()[YGEdgeLeft],
defaultYogaStyle.border()[YGEdgeLeft]),
debugStringConvertibleItem(
"borderTopWidth",
yogaStyle.border()[YGEdgeTop],
defaultYogaStyle.border()[YGEdgeTop]),
debugStringConvertibleItem(
"borderRightWidth",
yogaStyle.border()[YGEdgeRight],
defaultYogaStyle.border()[YGEdgeRight]),
debugStringConvertibleItem(
"borderBottomWidth",
yogaStyle.border()[YGEdgeBottom],
defaultYogaStyle.border()[YGEdgeBottom]),
debugStringConvertibleItem(
"borderStartWidth",
yogaStyle.border()[YGEdgeStart],
defaultYogaStyle.border()[YGEdgeStart]),
debugStringConvertibleItem(
"borderEndWidth",
yogaStyle.border()[YGEdgeEnd],
defaultYogaStyle.border()[YGEdgeEnd]),
debugStringConvertibleItem(
"borderHorizontalWidth",
yogaStyle.border()[YGEdgeHorizontal],
defaultYogaStyle.border()[YGEdgeHorizontal]),
debugStringConvertibleItem(
"borderVerticalWidth",
yogaStyle.border()[YGEdgeVertical],
defaultYogaStyle.border()[YGEdgeVertical]),
debugStringConvertibleItem(
"bordeWidth",
yogaStyle.border()[YGEdgeAll],
defaultYogaStyle.border()[YGEdgeAll]),
debugStringConvertibleItem(
"width",
yogaStyle.dimension(yoga::Dimension::Width),
Expand Down
38 changes: 2 additions & 36 deletions packages/react-native/ReactCommon/react/renderer/components/view/conversions.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ inline void fromRawValue(
inline void fromRawValue(
const PropsParserContext& context,
const RawValue& value,
yoga::Style::ValueRepr& result) {
yoga::CompactValue& result) {
if (value.hasType<Float>()) {
result = yoga::CompactValue::ofMaybe<YGUnitPoint>((float)value);
return;
Expand Down Expand Up @@ -428,7 +428,7 @@ inline void fromRawValue(
const PropsParserContext& context,
const RawValue& value,
YGValue& result) {
yoga::Style::ValueRepr ygValue{};
yoga::CompactValue ygValue{};
fromRawValue(context, value, ygValue);
result = ygValue;
}
Expand Down Expand Up @@ -778,40 +778,6 @@ inline std::string toString(const yoga::FloatOptional& value) {
return folly::to<std::string>(floatFromYogaFloat(value.unwrap()));
}

inline std::string toString(const yoga::Style::Dimensions& value) {
return "{" + toString(value[0]) + ", " + toString(value[1]) + "}";
}

inline std::string toString(const yoga::Style::Edges& value) {
static std::array<std::string, 9> names = {
{"left",
"top",
"right",
"bottom",
"start",
"end",
"horizontal",
"vertical",
"all"}};

auto result = std::string{};
auto separator = std::string{", "};

for (size_t i = 0; i < names.size(); i++) {
YGValue v = value[i];
if (v.unit == YGUnitUndefined) {
continue;
}
result += names[i] + ": " + toString(v) + separator;
}

if (!result.empty()) {
result.erase(result.length() - separator.length());
}

return "{" + result + "}";
}

inline std::string toString(const LayoutConformance& value) {
switch (value) {
case LayoutConformance::Undefined:
Expand Down

0 comments on commit b2baeec

Please sign in to comment.