refactor: use FNV-1a hashing for calc expression property identification

Author: paradowstack

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

@@ -950,12 +950,11 @@ YGValue YogaLayoutableShadowNode::yogaNodeCalcValueResolver(
 
   auto& node = shadowNodeFromContext(yogaNode);
   auto& props = static_cast<const YogaStylableProps&>(*node.props_);
-  auto key = static_cast<CalcExpressionPropertyID>(id);
-  if (!props.calcExpressions.contains(key)) {
+  if (!props.calcExpressions.contains(id)) {
     return {};
   }
-  
-  auto& calc = props.calcExpressions.at(key);
+
+  auto& calc = props.calcExpressions.at(id);
   return YGValue(
       calc.resolve(
           context.referenceLength,

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

@@ -17,6 +17,7 @@
 #include <bitset>
 #include <cmath>
 #include <optional>
+#include <unordered_map>
 
 namespace facebook::react {
 
@@ -254,46 +255,6 @@ inline bool areBorderRadiiCircular(const BorderRadii &borderRadii)
   return borderRadii.isUniform() && borderRadii.topLeft.horizontal == borderRadii.topLeft.vertical;
 }
 
-enum class CalcExpressionPropertyID : uint8_t {
-  Width,
-  Height,
-  MinWidth,
-  MinHeight,
-  MaxWidth,
-  MaxHeight,
-  FlexBasis,
-  RowGap,
-  ColumnGap,
-  Gap,
-  Left,
-  Top,
-  Right,
-  Bottom,
-  Start,
-  End,
-  InsetInline,
-  InsetBlock,
-  Inset,
-  MarginLeft,
-  MarginTop,
-  MarginRight,
-  MarginBottom,
-  MarginStart,
-  MarginEnd,
-  MarginHorizontal,
-  MarginVertical,
-  MarginAll,
-  PaddingLeft,
-  PaddingTop,
-  PaddingRight,
-  PaddingBottom,
-  PaddingStart,
-  PaddingEnd,
-  PaddingHorizontal,
-  PaddingVertical,
-  PaddingAll,
-};
-
-using CalcExpressions = std::unordered_map<CalcExpressionPropertyID, CSSCalc>;
+using CalcExpressions = std::unordered_map<uint32_t, CSSCalc>;
 
 } // namespace facebook::react

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

@@ -58,7 +58,7 @@ YG_EXPORT bool YGFloatIsUndefined(float value);
 /**
  * Host-defined identifier for a dynamic style value.
  */
-typedef uint8_t YGValueDynamicID;
+typedef uint32_t YGValueDynamicID;
 
 /**
  * Layout context passed to YGValueDynamic for resolving dynamic values.
@@ -77,14 +77,6 @@ typedef YGValue (*YGValueDynamic)(
     YGValueDynamicID id,
     YGValueDynamicContext context);
 
-/**
- * Callback + identifier pair for internal storage.
- */
-struct YGValueDynamicData {
-  YGValueDynamic callback;
-  YGValueDynamicID id;
-};
-
 YG_EXTERN_C_END
 
 // Equality operators for comparison of YGValue in C++

packages/react-native/ReactCommon/yoga/yoga/YGValue.h

@@ -147,6 +147,11 @@ class StyleLength {
   }
 
  private:
+  struct YGValueDynamicData {
+    YGValueDynamic callback;
+    YGValueDynamicID id;
+  };
+
   union Payload {
     constexpr Payload() : value{} {}
     constexpr explicit Payload(FloatOptional val) : value(val) {}

packages/react-native/ReactCommon/yoga/yoga/style/StyleLength.h

@@ -178,6 +178,11 @@ class StyleSizeLength {
   }
 
  private:
+  struct YGValueDynamicData {
+    YGValueDynamic callback;
+    YGValueDynamicID id;
+  };
+
   union Payload {
     constexpr Payload() : value{} {}
     constexpr explicit Payload(FloatOptional val) : value(val) {}

packages/react-native/ReactCommon/yoga/yoga/style/StyleSizeLength.h

@@ -185,7 +185,7 @@ class StyleValuePool {
   YGValueDynamicID getDynamicCallbackID(StyleValueHandle handle) const {
     assert(handle.isDynamic());
     assert(handle.isValueIndexed());
-    return static_cast<uint8_t>(buffer_.get32(handle.value() + 2));
+    return buffer_.get32(handle.value() + 2);
   }
 
   static constexpr bool isIntegerPackable(float f) {