status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Decouple from storage type in `YGStyle` 

Summary:
@public

The storage format of `YGValue` in `YGStyle` is an implementation detail that is going to change soon. It is only guaranteed to be assignable from, and castable to `YGValue`.
Here, we remove tight coupling from the actual implementation in React Native.

Reviewed By: shergin

Differential Revision: D13465113

fbshipit-source-id: 41dfcb90c2a1cd825a6732854bf84d4c3318d835
This commit is contained in:
David Aurelio 2018-12-18 02:44:35 -08:00 committed by Facebook Github Bot
parent c3caca9210
commit 375311091c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ReactCommon/fabric/components/view/conversions.h
View File

@ -60,7 +60,7 @@ inline YGValue yogaStyleValueFromFloat(const Float &value) {
}
inline folly::Optional<Float> optionalFloatFromYogaValue(
const YGValue &value,
const YGValue value,
folly::Optional<Float> base = {}) {
switch (value.unit) {
case YGUnitUndefined:
@ -297,7 +297,9 @@ inline void fromDynamic(const folly::dynamic &value, YGDisplay &result) {
abort();
}
inline void fromDynamic(const folly::dynamic &value, YGValue &result) {
inline void fromDynamic(
const folly::dynamic &value,
decltype(YGStyle{}.margin[0]) /* type is subject to change */ &result) {
if (value.isNumber()) {
result = yogaStyleValueFromFloat(value.asDouble());
return;
@ -308,12 +310,12 @@ inline void fromDynamic(const folly::dynamic &value, YGValue &result) {
return;
} else {
if (stringValue.back() == '%') {
result = {
result = YGValue{
folly::to<float>(stringValue.substr(0, stringValue.length() - 1)),
YGUnitPercent};
return;
} else {
result = {folly::to<float>(stringValue), YGUnitPoint};
result = YGValue{folly::to<float>(stringValue), YGUnitPoint};
return;
}
}
@ -602,10 +604,11 @@ inline std::string toString(const YGStyle::Edges &value) {
auto separator = std::string{", "};
for (auto i = 0; i < YGEdgeCount; i++) {
if (value[i].unit == YGUnitUndefined) {
YGValue v = value[i];
if (v.unit == YGUnitUndefined) {
continue;
}
result += names[i] + ": " + toString(value[i]) + separator;
result += names[i] + ": " + toString(v) + separator;
}
if (!result.empty()) {