diff --git a/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GeneratePropsH-test.js.snap b/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GeneratePropsH-test.js.snap index 6bbef39bf4fb..83866b74863d 100644 --- a/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GeneratePropsH-test.js.snap +++ b/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GeneratePropsH-test.js.snap @@ -87,7 +87,7 @@ struct ArrayPropsNativeComponentViewObjectStruct { }; static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ArrayPropsNativeComponentViewObjectStruct &result) { - auto map = (butter::map)value; + auto map = (std::unordered_map)value; auto tmp_prop = map.find(\\"prop\\"); if (tmp_prop != map.end()) { @@ -115,7 +115,7 @@ struct ArrayPropsNativeComponentViewArrayOfObjectsStruct { }; static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ArrayPropsNativeComponentViewArrayOfObjectsStruct &result) { - auto map = (butter::map)value; + auto map = (std::unordered_map)value; auto tmp_prop1 = map.find(\\"prop1\\"); if (tmp_prop1 != map.end()) { @@ -796,7 +796,7 @@ struct ObjectPropsNativeComponentObjectPropStruct { }; static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsNativeComponentObjectPropStruct &result) { - auto map = (butter::map)value; + auto map = (std::unordered_map)value; auto tmp_stringProp = map.find(\\"stringProp\\"); if (tmp_stringProp != map.end()) { @@ -833,7 +833,7 @@ struct ObjectPropsNativeComponentObjectArrayPropStruct { }; static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsNativeComponentObjectArrayPropStruct &result) { - auto map = (butter::map)value; + auto map = (std::unordered_map)value; auto tmp_array = map.find(\\"array\\"); if (tmp_array != map.end()) { @@ -852,7 +852,7 @@ struct ObjectPropsNativeComponentObjectPrimitiveRequiredPropStruct { }; static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsNativeComponentObjectPrimitiveRequiredPropStruct &result) { - auto map = (butter::map)value; + auto map = (std::unordered_map)value; auto tmp_image = map.find(\\"image\\"); if (tmp_image != map.end()) { diff --git a/packages/react-native-codegen/src/generators/components/GeneratePropsH.js b/packages/react-native-codegen/src/generators/components/GeneratePropsH.js index b8d4f91d5508..479c82cd50aa 100644 --- a/packages/react-native-codegen/src/generators/components/GeneratePropsH.js +++ b/packages/react-native-codegen/src/generators/components/GeneratePropsH.js @@ -161,7 +161,7 @@ const StructTemplate = ({ }; static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ${structName} &result) { - auto map = (butter::map)value; + auto map = (std::unordered_map)value; ${fromCases} } diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsH-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsH-test.js.snap index 04a92df053ee..d22ef6b85965 100644 --- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsH-test.js.snap +++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsH-test.js.snap @@ -86,7 +86,7 @@ struct ArrayPropsNativeComponentObjectStruct { }; static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ArrayPropsNativeComponentObjectStruct &result) { - auto map = (butter::map)value; + auto map = (std::unordered_map)value; auto tmp_stringProp = map.find(\\"stringProp\\"); if (tmp_stringProp != map.end()) { @@ -113,7 +113,7 @@ struct ArrayPropsNativeComponentArrayObjectStruct { }; static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ArrayPropsNativeComponentArrayObjectStruct &result) { - auto map = (butter::map)value; + auto map = (std::unordered_map)value; auto tmp_stringProp = map.find(\\"stringProp\\"); if (tmp_stringProp != map.end()) { @@ -140,7 +140,7 @@ struct ArrayPropsNativeComponentArrayStruct { }; static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ArrayPropsNativeComponentArrayStruct &result) { - auto map = (butter::map)value; + auto map = (std::unordered_map)value; auto tmp_object = map.find(\\"object\\"); if (tmp_object != map.end()) { @@ -167,7 +167,7 @@ struct ArrayPropsNativeComponentArrayOfArrayOfObjectStruct { }; static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ArrayPropsNativeComponentArrayOfArrayOfObjectStruct &result) { - auto map = (butter::map)value; + auto map = (std::unordered_map)value; auto tmp_stringProp = map.find(\\"stringProp\\"); if (tmp_stringProp != map.end()) { @@ -251,7 +251,7 @@ struct ArrayPropsNativeComponentNativePrimitivesStruct { }; static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ArrayPropsNativeComponentNativePrimitivesStruct &result) { - auto map = (butter::map)value; + auto map = (std::unordered_map)value; auto tmp_colors = map.find(\\"colors\\"); if (tmp_colors != map.end()) { @@ -1151,7 +1151,7 @@ struct ObjectPropsObjectPropObjectArrayPropStruct { }; static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsObjectPropObjectArrayPropStruct &result) { - auto map = (butter::map)value; + auto map = (std::unordered_map)value; auto tmp_array = map.find(\\"array\\"); if (tmp_array != map.end()) { @@ -1170,7 +1170,7 @@ struct ObjectPropsObjectPropObjectPrimitiveRequiredPropStruct { }; static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsObjectPropObjectPrimitiveRequiredPropStruct &result) { - auto map = (butter::map)value; + auto map = (std::unordered_map)value; auto tmp_image = map.find(\\"image\\"); if (tmp_image != map.end()) { @@ -1195,7 +1195,7 @@ struct ObjectPropsObjectPropNestedPropANestedPropBStruct { }; static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsObjectPropNestedPropANestedPropBStruct &result) { - auto map = (butter::map)value; + auto map = (std::unordered_map)value; auto tmp_nestedPropC = map.find(\\"nestedPropC\\"); if (tmp_nestedPropC != map.end()) { @@ -1212,7 +1212,7 @@ struct ObjectPropsObjectPropNestedPropAStruct { }; static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsObjectPropNestedPropAStruct &result) { - auto map = (butter::map)value; + auto map = (std::unordered_map)value; auto tmp_nestedPropB = map.find(\\"nestedPropB\\"); if (tmp_nestedPropB != map.end()) { @@ -1229,7 +1229,7 @@ struct ObjectPropsObjectPropNestedArrayAsPropertyArrayPropStruct { }; static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsObjectPropNestedArrayAsPropertyArrayPropStruct &result) { - auto map = (butter::map)value; + auto map = (std::unordered_map)value; auto tmp_stringProp = map.find(\\"stringProp\\"); if (tmp_stringProp != map.end()) { @@ -1256,7 +1256,7 @@ struct ObjectPropsObjectPropNestedArrayAsPropertyStruct { }; static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsObjectPropNestedArrayAsPropertyStruct &result) { - auto map = (butter::map)value; + auto map = (std::unordered_map)value; auto tmp_arrayProp = map.find(\\"arrayProp\\"); if (tmp_arrayProp != map.end()) { @@ -1282,7 +1282,7 @@ struct ObjectPropsObjectPropStruct { }; static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, ObjectPropsObjectPropStruct &result) { - auto map = (butter::map)value; + auto map = (std::unordered_map)value; auto tmp_stringProp = map.find(\\"stringProp\\"); if (tmp_stringProp != map.end()) { diff --git a/packages/react-native/React/Fabric/Mounting/RCTComponentViewFactory.mm b/packages/react-native/React/Fabric/Mounting/RCTComponentViewFactory.mm index 83bbb58a3e85..0b15d7112a85 100644 --- a/packages/react-native/React/Fabric/Mounting/RCTComponentViewFactory.mm +++ b/packages/react-native/React/Fabric/Mounting/RCTComponentViewFactory.mm @@ -11,8 +11,8 @@ #import #import -#import #import +#import #import #import @@ -59,7 +59,7 @@ void RCTInstallNativeComponentRegistryBinding(facebook::jsi::Runtime &runtime) } @implementation RCTComponentViewFactory { - butter::map _componentViewClasses; + std::unordered_map _componentViewClasses; std::unordered_set _registeredComponentsNames; ComponentDescriptorProviderRegistry _providerRegistry; std::shared_mutex _mutex; diff --git a/packages/react-native/React/Fabric/Mounting/RCTComponentViewRegistry.mm b/packages/react-native/React/Fabric/Mounting/RCTComponentViewRegistry.mm index 2a19f34365b9..e78e8ae53342 100644 --- a/packages/react-native/React/Fabric/Mounting/RCTComponentViewRegistry.mm +++ b/packages/react-native/React/Fabric/Mounting/RCTComponentViewRegistry.mm @@ -14,8 +14,7 @@ #import #import #import - -#import +#import using namespace facebook; using namespace facebook::react; @@ -23,8 +22,8 @@ const NSInteger RCTComponentViewRegistryRecyclePoolMaxSize = 1024; @implementation RCTComponentViewRegistry { - butter::map _registry; - butter::map> _recyclePool; + std::unordered_map _registry; + std::unordered_map> _recyclePool; } - (instancetype)init diff --git a/packages/react-native/React/Fabric/Mounting/RCTMountingManager.mm b/packages/react-native/React/Fabric/Mounting/RCTMountingManager.mm index 837925d2a4f3..b4cfb3d0ede1 100644 --- a/packages/react-native/React/Fabric/Mounting/RCTMountingManager.mm +++ b/packages/react-native/React/Fabric/Mounting/RCTMountingManager.mm @@ -8,7 +8,6 @@ #import "RCTMountingManager.h" #import -#import #import #import diff --git a/packages/react-native/React/Fabric/Mounting/RCTMountingTransactionObserverCoordinator.h b/packages/react-native/React/Fabric/Mounting/RCTMountingTransactionObserverCoordinator.h index 317390536f9f..40ba1fd82146 100644 --- a/packages/react-native/React/Fabric/Mounting/RCTMountingTransactionObserverCoordinator.h +++ b/packages/react-native/React/Fabric/Mounting/RCTMountingTransactionObserverCoordinator.h @@ -6,10 +6,10 @@ */ #import +#import #import -#import "RCTMountingTransactionObserverCoordinator.h" -#import +#import "RCTMountingTransactionObserverCoordinator.h" #include @@ -38,7 +38,7 @@ class RCTMountingTransactionObserverCoordinator final { const facebook::react::SurfaceTelemetry& surfaceTelemetry) const; private: - facebook::butter::map< + std::unordered_map< facebook::react::SurfaceId, std::unordered_set> registry_; diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/Binding.h b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/Binding.h index e735bb0b48de..d4266bcab6f2 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/Binding.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/Binding.h @@ -9,6 +9,7 @@ #include #include +#include #include #include @@ -139,7 +140,7 @@ class Binding : public jni::HybridClass, BackgroundExecutor backgroundExecutor_; - butter::map surfaceHandlerRegistry_{}; + std::unordered_map surfaceHandlerRegistry_{}; std::shared_mutex surfaceHandlerRegistryMutex_; // Protects `surfaceHandlerRegistry_`. diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h index 0edc461a0bd7..9ee80750c165 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h @@ -8,6 +8,7 @@ #pragma once #include +#include #include #include @@ -58,7 +59,8 @@ class FabricMountingManager final { std::recursive_mutex commitMutex_; - butter::map> allocatedViewRegistry_{}; + std::unordered_map> + allocatedViewRegistry_{}; std::recursive_mutex allocatedViewsMutex_; const bool reduceDeleteCreateMutation_{false}; diff --git a/packages/react-native/ReactCommon/butter/.clang-tidy b/packages/react-native/ReactCommon/butter/.clang-tidy deleted file mode 100644 index 8edbbc799e94..000000000000 --- a/packages/react-native/ReactCommon/butter/.clang-tidy +++ /dev/null @@ -1,6 +0,0 @@ ---- -InheritParentConfig: true -Checks: '> -clang-diagnostic-*, -' -... diff --git a/packages/react-native/ReactCommon/butter/map.h b/packages/react-native/ReactCommon/butter/map.h deleted file mode 100644 index a5f6c665b68d..000000000000 --- a/packages/react-native/ReactCommon/butter/map.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#pragma once - -#include - -#ifdef BUTTER_USE_FOLLY_CONTAINERS - -#include - -#else - -#include - -#endif - -namespace facebook { -namespace butter { - -/* - * Note: In Butter, `map` aliases to `unordered_map` because everyone agrees - * that an *ordered* map is nonsense and was a huge mistake for standardization. - * If you need an *ordered* map, feel free to introduce that as - * `butter::ordered_map`. - */ - -#ifdef BUTTER_USE_FOLLY_CONTAINERS - -template -using map = folly::F14FastMap; - -#else - -template -using map = std::unordered_map; - -#endif - -} // namespace butter -} // namespace facebook diff --git a/packages/react-native/ReactCommon/react/bridging/Object.h b/packages/react-native/ReactCommon/react/bridging/Object.h index 2406c20f27fc..599b5ceb9357 100644 --- a/packages/react-native/ReactCommon/react/bridging/Object.h +++ b/packages/react-native/ReactCommon/react/bridging/Object.h @@ -10,7 +10,6 @@ #include #include -#include #include #include @@ -83,12 +82,6 @@ struct Bridging { } // namespace map_detail -#ifdef BUTTER_USE_FOLLY_CONTAINERS -template -struct Bridging> - : map_detail::Bridging> {}; -#endif - template struct Bridging> : map_detail::Bridging> {}; diff --git a/packages/react-native/ReactCommon/react/renderer/attributedstring/conversions.h b/packages/react-native/ReactCommon/react/renderer/attributedstring/conversions.h index e60973390512..9b562666bc79 100644 --- a/packages/react-native/ReactCommon/react/renderer/attributedstring/conversions.h +++ b/packages/react-native/ReactCommon/react/renderer/attributedstring/conversions.h @@ -23,6 +23,7 @@ #include #include #include +#include #ifdef ANDROID #include @@ -747,7 +748,7 @@ inline void fromRawValue( const PropsParserContext& context, const RawValue& value, AttributedString::Range& result) { - auto map = (butter::map)value; + auto map = (std::unordered_map)value; auto start = map.find("start"); if (start != map.end()) { diff --git a/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h b/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h index cdc87b4f9a79..042280af54fc 100644 --- a/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h +++ b/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h @@ -8,6 +8,7 @@ #pragma once #include +#include #include #include @@ -60,7 +61,7 @@ class ComponentDescriptorProviderRegistry final { mutable std::shared_mutex mutex_; mutable std::vector> componentDescriptorRegistries_; - mutable butter::map + mutable std::unordered_map componentDescriptorProviders_; mutable ComponentDescriptorProviderRequest componentDescriptorProviderRequest_{}; diff --git a/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.h b/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.h index 8fe4f18cefad..08c6e524fe25 100644 --- a/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.h +++ b/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.h @@ -9,8 +9,7 @@ #include #include - -#include +#include #include #include @@ -82,9 +81,10 @@ class ComponentDescriptorRegistry { void add(ComponentDescriptorProvider componentDescriptorProvider) const; mutable std::shared_mutex mutex_; - mutable butter::map + mutable std::unordered_map _registryByHandle; - mutable butter::map _registryByName; + mutable std::unordered_map + _registryByName; ComponentDescriptor::Shared _fallbackComponentDescriptor; ComponentDescriptorParameters parameters_{}; const ComponentDescriptorProviderRegistry& providerRegistry_; diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/conversions.h b/packages/react-native/ReactCommon/react/renderer/components/image/conversions.h index a6fac428a8da..e0d6d5f3780f 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/image/conversions.h +++ b/packages/react-native/ReactCommon/react/renderer/components/image/conversions.h @@ -7,7 +7,8 @@ #pragma once -#include +#include + #include #include #include @@ -29,8 +30,8 @@ inline void fromRawValue( return; } - if (value.hasType>()) { - auto items = (butter::map)value; + if (value.hasType>()) { + auto items = (std::unordered_map)value; result = {}; result.type = ImageSource::Type::Remote; diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/conversions.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/conversions.h index f1b344f68ade..4c2b581dcda8 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/conversions.h +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/conversions.h @@ -11,6 +11,7 @@ #include #include #include +#include namespace facebook::react { @@ -102,7 +103,7 @@ inline void fromRawValue( const PropsParserContext& context, const RawValue& value, ScrollViewMaintainVisibleContentPosition& result) { - auto map = (butter::map)value; + auto map = (std::unordered_map)value; auto minIndexForVisible = map.find("minIndexForVisible"); if (minIndexForVisible != map.end()) { diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h index ea52b6befd22..04d19a11bfbd 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h +++ b/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h @@ -15,6 +15,8 @@ #include #include +#include + #include namespace facebook::react { @@ -171,7 +173,8 @@ class AndroidTextInputComponentDescriptor final "com/facebook/react/fabric/FabricUIManager"; SharedTextLayoutManager textLayoutManager_; - mutable butter::map surfaceIdToThemePaddingMap_; + mutable std::unordered_map + surfaceIdToThemePaddingMap_; }; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h b/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h index c262e4711195..43cbb6859047 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h +++ b/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h @@ -7,9 +7,6 @@ #pragma once -// foo bar 2 - -// #include #include #include @@ -22,6 +19,7 @@ #include #include #include +#include #include namespace facebook::react { @@ -35,7 +33,7 @@ static inline void fromRawValue( const PropsParserContext& context, const RawValue& value, AndroidTextInputTextShadowOffsetStruct& result) { - auto map = (butter::map)value; + auto map = (std::unordered_map)value; auto width = map.find("width"); if (width != map.end()) { diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/accessibilityPropsConversions.h b/packages/react-native/ReactCommon/react/renderer/components/view/accessibilityPropsConversions.h index 247ef0aa72ea..7b16f62dc543 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/accessibilityPropsConversions.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/accessibilityPropsConversions.h @@ -15,6 +15,8 @@ #include #include +#include + namespace facebook::react { inline void fromString(const std::string& string, AccessibilityTraits& result) { @@ -133,7 +135,7 @@ inline void fromRawValue( const PropsParserContext& context, const RawValue& value, AccessibilityState& result) { - auto map = (butter::map)value; + auto map = (std::unordered_map)value; auto selected = map.find("selected"); if (selected != map.end()) { fromRawValue(context, selected->second, result.selected); @@ -213,7 +215,7 @@ inline void fromRawValue( const PropsParserContext& context, const RawValue& value, AccessibilityAction& result) { - auto map = (butter::map)value; + auto map = (std::unordered_map)value; auto name = map.find("name"); react_native_assert(name != map.end() && name->second.hasType()); @@ -233,7 +235,7 @@ inline void fromRawValue( const PropsParserContext&, const RawValue& value, AccessibilityValue& result) { - auto map = (butter::map)value; + auto map = (std::unordered_map)value; auto min = map.find("min"); if (min != map.end()) { diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/conversions.h b/packages/react-native/ReactCommon/react/renderer/components/view/conversions.h index 95b57b9396a2..3bdb9a066d7a 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/conversions.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/conversions.h @@ -7,7 +7,6 @@ #pragma once -#include #include #include #include @@ -23,6 +22,7 @@ #include #include #include +#include namespace facebook::react { @@ -488,14 +488,14 @@ inline void fromRawValue( auto configurations = static_cast>(value); for (const auto& configuration : configurations) { - if (!configuration.hasType>()) { + if (!configuration.hasType>()) { // TODO: The following checks have to be removed after codegen is shipped. // See T45151459. continue; } auto configurationPair = - static_cast>(configuration); + static_cast>(configuration); auto pair = configurationPair.begin(); auto operation = pair->first; auto& parameters = pair->second; diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/NativeDrawable.h b/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/NativeDrawable.h index 912dace552b0..1c2c99dbd863 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/NativeDrawable.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/NativeDrawable.h @@ -10,6 +10,7 @@ #include #include #include +#include namespace facebook::react { @@ -58,7 +59,7 @@ static inline void fromRawValue( const PropsParserContext& /*context*/, const RawValue& rawValue, NativeDrawable& result) { - auto map = (butter::map)rawValue; + auto map = (std::unordered_map)rawValue; auto typeIterator = map.find("type"); react_native_expect( diff --git a/packages/react-native/ReactCommon/react/renderer/core/RawProps.h b/packages/react-native/ReactCommon/react/renderer/core/RawProps.h index d54f0db32106..e01af9f84db3 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/RawProps.h +++ b/packages/react-native/ReactCommon/react/renderer/core/RawProps.h @@ -10,8 +10,6 @@ #include #include -#include - #include #include #include diff --git a/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.h b/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.h index be07591d1ef1..515018981713 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.h +++ b/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.h @@ -7,7 +7,6 @@ #pragma once -#include #include #include #include diff --git a/packages/react-native/ReactCommon/react/renderer/core/RawValue.h b/packages/react-native/ReactCommon/react/renderer/core/RawValue.h index 2db863a78665..32d5277e0b2f 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/RawValue.h +++ b/packages/react-native/ReactCommon/react/renderer/core/RawValue.h @@ -7,7 +7,8 @@ #pragma once -#include +#include + #include #include #include @@ -186,7 +187,7 @@ class RawValue { template static bool checkValueType( const folly::dynamic& dynamic, - butter::map* type) noexcept { + std::unordered_map* type) noexcept { if (!dynamic.isObject()) { return false; } @@ -264,11 +265,11 @@ class RawValue { } template - static butter::map castValue( + static std::unordered_map castValue( const folly::dynamic& dynamic, - butter::map* type) { + std::unordered_map* type) { react_native_assert(dynamic.isObject()); - auto result = butter::map{}; + auto result = std::unordered_map{}; for (const auto& item : dynamic.items()) { react_native_assert(item.first.isString()); result[item.first.getString()] = castValue(item.second, (T*)nullptr); diff --git a/packages/react-native/ReactCommon/react/renderer/core/graphicsConversions.h b/packages/react-native/ReactCommon/react/renderer/core/graphicsConversions.h index 502b526c0c75..04c8930e9198 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/graphicsConversions.h +++ b/packages/react-native/ReactCommon/react/renderer/core/graphicsConversions.h @@ -7,7 +7,8 @@ #pragma once -#include +#include + #include #include #include @@ -77,8 +78,8 @@ inline void fromRawValue( const PropsParserContext& context, const RawValue& value, Point& result) { - if (value.hasType>()) { - auto map = (butter::map)value; + if (value.hasType>()) { + auto map = (std::unordered_map)value; for (const auto& pair : map) { if (pair.first == "x") { result.x = pair.second; @@ -108,8 +109,8 @@ inline void fromRawValue( const PropsParserContext& context, const RawValue& value, Size& result) { - if (value.hasType>()) { - auto map = (butter::map)value; + if (value.hasType>()) { + auto map = (std::unordered_map)value; for (const auto& pair : map) { if (pair.first == "width") { result.width = pair.second; @@ -148,8 +149,8 @@ inline void fromRawValue( return; } - if (value.hasType>()) { - auto map = (butter::map)value; + if (value.hasType>()) { + auto map = (std::unordered_map)value; for (const auto& pair : map) { if (pair.first == "top") { result.top = pair.second; @@ -192,8 +193,8 @@ inline void fromRawValue( return; } - if (value.hasType>()) { - auto map = (butter::map)value; + if (value.hasType>()) { + auto map = (std::unordered_map)value; for (const auto& pair : map) { if (pair.first == "topLeft") { result.topLeft = pair.second; diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/platform/android/react/renderer/graphics/PlatformColorParser.h b/packages/react-native/ReactCommon/react/renderer/graphics/platform/android/react/renderer/graphics/PlatformColorParser.h index 07acf035f012..379bc9cf6b9f 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/platform/android/react/renderer/graphics/PlatformColorParser.h +++ b/packages/react-native/ReactCommon/react/renderer/graphics/platform/android/react/renderer/graphics/PlatformColorParser.h @@ -11,6 +11,7 @@ #include #include #include +#include namespace facebook::react { @@ -19,7 +20,8 @@ inline SharedColor parsePlatformColor( const RawValue& value) { ColorComponents colorComponents = {0, 0, 0, 0}; - if (value.hasType>>()) { + if (value.hasType< + std::unordered_map>>()) { const auto& fabricUIManager = context.contextContainer.at>( "FabricUIManager"); @@ -27,7 +29,7 @@ inline SharedColor parsePlatformColor( fabricUIManager->getClass() ->getMethod)>("getColor"); - auto map = (butter::map>)value; + auto map = (std::unordered_map>)value; auto& resourcePaths = map["resource_paths"]; auto javaResourcePaths = diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/Differentiator.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/Differentiator.cpp index db9aeed16a70..5ede0a186314 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/Differentiator.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/Differentiator.cpp @@ -7,7 +7,6 @@ #include "Differentiator.h" -#include #include #include #include diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.h b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.h index c2cfadb7ca2b..92d824e7f650 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.h +++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.h @@ -8,8 +8,7 @@ #pragma once #include - -#include +#include #include #include @@ -63,7 +62,7 @@ class ShadowTreeRegistry final { private: mutable std::shared_mutex mutex_; - mutable butter::map> + mutable std::unordered_map> registry_; // Protected by `mutex_`. }; diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.h b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.h index b44e6b0a4a69..2d656bcfaba1 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.h +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.h @@ -7,9 +7,9 @@ #pragma once -#include #include #include +#include #include #include @@ -60,7 +60,7 @@ class SurfaceManager final { const Scheduler& scheduler_; mutable std::shared_mutex mutex_; // Protects `registry_`. - mutable butter::map registry_{}; + mutable std::unordered_map registry_{}; }; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/timeline/TimelineController.h b/packages/react-native/ReactCommon/react/renderer/timeline/TimelineController.h index a1415a061c19..a4f54eadb262 100644 --- a/packages/react-native/ReactCommon/react/renderer/timeline/TimelineController.h +++ b/packages/react-native/ReactCommon/react/renderer/timeline/TimelineController.h @@ -9,8 +9,7 @@ #include #include - -#include +#include #include #include @@ -67,7 +66,7 @@ class TimelineController final : public UIManagerCommitHook { /* * Owning collection of all running `Timeline` instances. */ - mutable butter::map> timelines_; + mutable std::unordered_map> timelines_; mutable const UIManager* uiManager_; mutable SurfaceId lastUpdatedSurface_; diff --git a/packages/react-native/ReactCommon/react/utils/ContextContainer.h b/packages/react-native/ReactCommon/react/utils/ContextContainer.h index 1c73ac0e6998..ae22bf77d3bc 100644 --- a/packages/react-native/ReactCommon/react/utils/ContextContainer.h +++ b/packages/react-native/ReactCommon/react/utils/ContextContainer.h @@ -12,8 +12,7 @@ #include #include #include - -#include +#include #include #include @@ -105,7 +104,7 @@ class ContextContainer final { private: mutable std::shared_mutex mutex_; // Protected by mutex_`. - mutable butter::map> instances_; + mutable std::unordered_map> instances_; }; } // namespace facebook::react