diff --git a/packages/react-native/ReactCommon/react/renderer/attributedstring/TextAttributes.h b/packages/react-native/ReactCommon/react/renderer/attributedstring/TextAttributes.h index 2d0962193ce..d259554839f 100644 --- a/packages/react-native/ReactCommon/react/renderer/attributedstring/TextAttributes.h +++ b/packages/react-native/ReactCommon/react/renderer/attributedstring/TextAttributes.h @@ -11,7 +11,6 @@ #include #include -#include #include #include #include @@ -20,6 +19,7 @@ #include #include #include +#include namespace facebook::react { @@ -108,8 +108,7 @@ template <> struct hash { size_t operator()( const facebook::react::TextAttributes& textAttributes) const { - return folly::hash::hash_combine( - 0, + return facebook::react::hash_combine( textAttributes.foregroundColor, textAttributes.backgroundColor, textAttributes.opacity, diff --git a/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.cpp b/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.cpp index 620685d713d..2aafcbd036e 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.cpp @@ -7,7 +7,6 @@ #include "RawPropsParser.h" -#include #include #include #include diff --git a/packages/react-native/ReactCommon/react/renderer/core/RawPropsPrimitives.h b/packages/react-native/ReactCommon/react/renderer/core/RawPropsPrimitives.h index 0da85c189d5..cc781682b1b 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/RawPropsPrimitives.h +++ b/packages/react-native/ReactCommon/react/renderer/core/RawPropsPrimitives.h @@ -7,7 +7,6 @@ #pragma once -#include #include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h index 244cf2c5ca4..0bed0d7d6c7 100644 --- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h +++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h @@ -178,8 +178,7 @@ inline size_t textAttributedStringHashLayoutWise( auto seed = size_t{0}; for (const auto& fragment : attributedString.getFragments()) { - seed = - folly::hash::hash_combine(seed, textAttributesHashLayoutWise(fragment)); + facebook::react::hash_combine(seed, textAttributesHashLayoutWise(fragment)); } return seed; @@ -208,8 +207,7 @@ namespace std { template <> struct hash { size_t operator()(const facebook::react::TextMeasureCacheKey& key) const { - return folly::hash::hash_combine( - 0, + return facebook::react::hash_combine( textAttributedStringHashLayoutWise(key.attributedString), key.paragraphAttributes, key.layoutConstraints.maximumSize.width);