use ValueUnit struct

Author: intergalacticspacehighway

packages/react-native/ReactCommon/react/renderer/components/view/BaseViewProps.cpp

@@ -27,9 +27,9 @@ std::array<float, 3> getTranslateForTransformOrigin(float viewWidth, float viewH
 
   for (size_t i = 0; i < transformOrigin.xy.size(); ++i) {
     auto& currentOrigin = transformOrigin.xy[i];
-    if (currentOrigin.unit == YGUnitPoint) {
+    if (currentOrigin.unit == UnitType::Point) {
       origin[i] = currentOrigin.value;
-    } else if (currentOrigin.unit == YGUnitPercent) {
+    } else if (currentOrigin.unit == UnitType::Percent) {
         origin[i] = ((i == 0) ? viewWidth : viewHeight) * currentOrigin.value / 100.0f;
       }
     }

packages/react-native/ReactCommon/react/renderer/components/view/conversions.h

@@ -16,6 +16,7 @@
 #include <react/renderer/core/LayoutMetrics.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/graphics/Transform.h>
+#include <react/renderer/graphics/ValueUnit.h>
 #include <stdlib.h>
 #include <yoga/YGEnums.h>
 #include <yoga/YGNode.h>
@@ -571,15 +572,20 @@ inline void fromRawValue(
    for (size_t i = 0; i < std::min(origins.size(), maxIndex); i++) {
      const auto& origin = origins[i];
      if (origin.hasType<Float>()) {
-       transformOrigin.xy[i] = yogaStyleValueFromFloat((Float)origin);
+       const float originFloat = (float) origin;
+       if (std::isfinite(originFloat)) {
+         transformOrigin.xy[i] = ValueUnit(originFloat, UnitType::Point);
+       } else {
+         transformOrigin.xy[i] = ValueUnit(0.0f, UnitType::Undefined);
+       }
      } else if (origin.hasType<std::string>()) {
        const auto stringValue = (std::string)origin;
 
        if (stringValue.back() == '%') {
          auto tryValue = folly::tryTo<float>(
                                              std::string_view(stringValue).substr(0, stringValue.length() - 1));
          if (tryValue.hasValue()) {
-           transformOrigin.xy[i] = YGValue{tryValue.value(), YGUnitPercent};
+           transformOrigin.xy[i] = ValueUnit(tryValue.value(), UnitType::Percent);
          }
        }
      }

packages/react-native/ReactCommon/react/renderer/graphics/Transform.h

@@ -16,7 +16,7 @@
 #include <react/renderer/graphics/RectangleEdges.h>
 #include <react/renderer/graphics/Size.h>
 #include <react/renderer/graphics/Vector.h>
-#include <yoga/YGValue.h>
+#include <react/renderer/graphics/ValueUnit.h>
 
 #ifdef ANDROID
 #include <folly/dynamic.h>
@@ -52,18 +52,18 @@ struct TransformOperation {
 };
 
 struct TransformOrigin {
-  std::array<YGValue, 2> xy;
+  std::array<ValueUnit, 2> xy;
   float z = 0.0f;
 
   bool operator==(const TransformOrigin& other) const {
     return xy[0] == other.xy[0] && xy[1] == other.xy[1] && z == other.z;
   }
   bool operator!=(const TransformOrigin& other) const {
     return !(*this == other);
-  };
+  }
   bool isSet() const {
-    return xy[0].value != 0.0f || xy[0].unit != YGUnitUndefined
-        || xy[1].value != 0.0f || xy[1].unit != YGUnitUndefined
+    return xy[0].value != 0.0f || xy[0].unit != UnitType::Undefined
+        || xy[1].value != 0.0f || xy[1].unit != UnitType::Undefined
         || z != 0.0f;
   }
 };

packages/react-native/ReactCommon/react/renderer/graphics/ValueUnit.h

@@ -12,6 +12,7 @@ struct ValueUnit {
   float value{0.0f};
   UnitType unit{UnitType::Undefined};
 
+  ValueUnit() = default;
   ValueUnit(float v, UnitType u) : value(v), unit(u) {}
 
   bool operator==(const ValueUnit& other) const {