kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-01-12 22:50:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fabric: Remove designated initializers in View (#23440)

Browse Source 
Summary:
This pull request removes the designated initializers in `react/components/view/**` to improve portability.

[General] [Changed] - Fabric: Remove designated initializers in View
Pull Request resolved: https://github.com/facebook/react-native/pull/23440

Differential Revision: D14298887

Pulled By: shergin

fbshipit-source-id: 074a038cdacd448911b39441d84e341a56b666cf
This commit is contained in:
empyrical
2019-03-03 22:38:19 -08:00
committed by Facebook Github Bot
parent 4936a663ae
commit 9e3a1f0e70
2 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ReactCommon/fabric/components/view/ViewProps.cpp
View File

@@ -79,21 +79,26 @@ ViewProps::ViewProps(const ViewProps &sourceProps, const RawProps &rawProps)
BorderMetrics ViewProps::resolveBorderMetrics(bool isRTL) const {
auto borderWidths = CascadedBorderWidths{
.left = optionalFloatFromYogaValue(yogaStyle.border[YGEdgeLeft]),
.top = optionalFloatFromYogaValue(yogaStyle.border[YGEdgeTop]),
.right = optionalFloatFromYogaValue(yogaStyle.border[YGEdgeRight]),
.bottom = optionalFloatFromYogaValue(yogaStyle.border[YGEdgeBottom]),
.start = optionalFloatFromYogaValue(yogaStyle.border[YGEdgeStart]),
.end = optionalFloatFromYogaValue(yogaStyle.border[YGEdgeEnd]),
.horizontal =
optionalFloatFromYogaValue(yogaStyle.border[YGEdgeHorizontal]),
.vertical = optionalFloatFromYogaValue(yogaStyle.border[YGEdgeVertical]),
.all = optionalFloatFromYogaValue(yogaStyle.border[YGEdgeAll])};
/* .left = */ optionalFloatFromYogaValue(yogaStyle.border[YGEdgeLeft]),
/* .top = */ optionalFloatFromYogaValue(yogaStyle.border[YGEdgeTop]),
/* .right = */ optionalFloatFromYogaValue(yogaStyle.border[YGEdgeRight]),
/* .bottom = */
optionalFloatFromYogaValue(yogaStyle.border[YGEdgeBottom]),
/* .start = */ optionalFloatFromYogaValue(yogaStyle.border[YGEdgeStart]),
/* .end = */ optionalFloatFromYogaValue(yogaStyle.border[YGEdgeEnd]),
/* .horizontal = */
optionalFloatFromYogaValue(yogaStyle.border[YGEdgeHorizontal]),
/* .vertical = */
optionalFloatFromYogaValue(yogaStyle.border[YGEdgeVertical]),
/* .all = */ optionalFloatFromYogaValue(yogaStyle.border[YGEdgeAll]),
};
return {.borderColors = borderColors.resolve(isRTL, {}),
.borderWidths = borderWidths.resolve(isRTL, 0),
.borderRadii = borderRadii.resolve(isRTL, 0),
.borderStyles = borderStyles.resolve(isRTL, BorderStyle::Solid)};
return {
/* .borderColors = */ borderColors.resolve(isRTL, {}),
/* .borderWidths = */ borderWidths.resolve(isRTL, 0),
/* .borderRadii = */ borderRadii.resolve(isRTL, 0),
/* .borderStyles = */ borderStyles.resolve(isRTL, BorderStyle::Solid),
};
}
#pragma mark - DebugStringConvertible

31
ReactCommon/fabric/components/view/primitives.h
View File

@@ -204,11 +204,13 @@ struct CascadedRectangleEdges {
const auto verticalOrAllOrDefault =
vertical.value_or(all.value_or(defaults));
return Counterpart{
.left = left.value_or(leading.value_or(horizontalOrAllOrDefault)),
.right = right.value_or(trailing.value_or(horizontalOrAllOrDefault)),
.top = top.value_or(verticalOrAllOrDefault),
.bottom = bottom.value_or(verticalOrAllOrDefault)};
return {
/* .left = */ left.value_or(leading.value_or(horizontalOrAllOrDefault)),
/* .right = */
right.value_or(trailing.value_or(horizontalOrAllOrDefault)),
/* .top = */ top.value_or(verticalOrAllOrDefault),
/* .bottom = */ bottom.value_or(verticalOrAllOrDefault),
};
}
bool operator==(const CascadedRectangleEdges<T> &rhs) const {
@@ -260,15 +262,16 @@ struct CascadedRectangleCorners {
const auto bottomLeading = isRTL ? bottomEnd : bottomStart;
const auto bottomTrailing = isRTL ? bottomStart : bottomEnd;
return Counterpart{
.topLeft =
topLeft.value_or(topLeading.value_or(all.value_or(defaults))),
.topRight =
topRight.value_or(topTrailing.value_or(all.value_or(defaults))),
.bottomLeft =
bottomLeft.value_or(topLeading.value_or(all.value_or(defaults))),
.bottomRight =
bottomRight.value_or(topTrailing.value_or(all.value_or(defaults)))};
return {
/* .topLeft = */ topLeft.value_or(
topLeading.value_or(all.value_or(defaults))),
/* .topRight = */
topRight.value_or(topTrailing.value_or(all.value_or(defaults))),
/* .bottomLeft = */
bottomLeft.value_or(topLeading.value_or(all.value_or(defaults))),
/* .bottomRight = */
bottomRight.value_or(topTrailing.value_or(all.value_or(defaults))),
};
}
bool operator==(const CascadedRectangleCorners<T> &rhs) const {