From 9e3a1f0e70c7fdfe431709e3c306abefe6bc80ed Mon Sep 17 00:00:00 2001
From: empyrical <empyrical@outlook.com>
Date: Sun, 3 Mar 2019 22:38:19 -0800
Subject: [PATCH] Fabric: Remove designated initializers in View (#23440)

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
---
 .../fabric/components/view/ViewProps.cpp      | 33 +++++++++++--------
 .../fabric/components/view/primitives.h       | 31 +++++++++--------
 2 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/ReactCommon/fabric/components/view/ViewProps.cpp b/ReactCommon/fabric/components/view/ViewProps.cpp
index db11821b8..f2dc4572f 100644
--- a/ReactCommon/fabric/components/view/ViewProps.cpp
+++ b/ReactCommon/fabric/components/view/ViewProps.cpp
@@ -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
diff --git a/ReactCommon/fabric/components/view/primitives.h b/ReactCommon/fabric/components/view/primitives.h
index 049672510..d7900c232 100644
--- a/ReactCommon/fabric/components/view/primitives.h
+++ b/ReactCommon/fabric/components/view/primitives.h
@@ -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 {