diff --git a/packages/react-native/React/CxxBridge/RCTCxxBridge.mm b/packages/react-native/React/CxxBridge/RCTCxxBridge.mm index bab39104d5234b..9ea645d4752688 100644 --- a/packages/react-native/React/CxxBridge/RCTCxxBridge.mm +++ b/packages/react-native/React/CxxBridge/RCTCxxBridge.mm @@ -66,7 +66,7 @@ static NSString *const RCTJSThreadName = @"com.facebook.react.JavaScript"; -typedef void (^RCTPendingCall)(); +using RCTPendingCall = void (^)(); using namespace facebook::jsi; using namespace facebook::react; diff --git a/packages/react-native/React/DevSupport/RCTInspectorNetworkHelper.h b/packages/react-native/React/DevSupport/RCTInspectorNetworkHelper.h index 3494b5b9135c07..db6091f62ffbfc 100644 --- a/packages/react-native/React/DevSupport/RCTInspectorNetworkHelper.h +++ b/packages/react-native/React/DevSupport/RCTInspectorNetworkHelper.h @@ -11,11 +11,11 @@ #import -typedef facebook::react::jsinspector_modern::NetworkRequestListener RCTInspectorNetworkListener; +using RCTInspectorNetworkListener = facebook::react::jsinspector_modern::NetworkRequestListener; -typedef facebook::react::jsinspector_modern::ScopedExecutor RCTInspectorNetworkExecutor; +using RCTInspectorNetworkExecutor = facebook::react::jsinspector_modern::ScopedExecutor; -typedef facebook::react::jsinspector_modern::LoadNetworkResourceRequest RCTInspectorLoadNetworkResourceRequest; +using RCTInspectorLoadNetworkResourceRequest = facebook::react::jsinspector_modern::LoadNetworkResourceRequest; /** * A helper class that wraps around NSURLSession to make network requests. diff --git a/packages/react-native/React/DevSupport/RCTInspectorNetworkHelper.mm b/packages/react-native/React/DevSupport/RCTInspectorNetworkHelper.mm index 538d9767e1d2f4..53e8fde774ecbe 100644 --- a/packages/react-native/React/DevSupport/RCTInspectorNetworkHelper.mm +++ b/packages/react-native/React/DevSupport/RCTInspectorNetworkHelper.mm @@ -8,7 +8,7 @@ #import "RCTInspectorNetworkHelper.h" #import -typedef void (^ListenerBlock)(RCTInspectorNetworkListener *); +using ListenerBlock = void (^)(RCTInspectorNetworkListener *); @interface RCTInspectorNetworkHelper () @property (nonatomic, strong) NSURLSession *session; diff --git a/packages/react-native/React/Modules/RCTUIManagerObserverCoordinator.h b/packages/react-native/React/Modules/RCTUIManagerObserverCoordinator.h index eeb569c41ee2f0..35804ac1677137 100644 --- a/packages/react-native/React/Modules/RCTUIManagerObserverCoordinator.h +++ b/packages/react-native/React/Modules/RCTUIManagerObserverCoordinator.h @@ -9,7 +9,7 @@ #import -typedef dispatch_block_t RCTUIManagerMountingBlock; +using RCTUIManagerMountingBlock = dispatch_block_t; /** * Allows hooking into UIManager internals. This can be used to execute code at diff --git a/packages/react-native/React/Views/RCTFont.mm b/packages/react-native/React/Views/RCTFont.mm index fe350138fd9590..ed6425e9cf2b2a 100644 --- a/packages/react-native/React/Views/RCTFont.mm +++ b/packages/react-native/React/Views/RCTFont.mm @@ -205,7 +205,7 @@ + (UIFont *)UIFont:(id)json UIFontWeightRegular, doubleValue) -typedef BOOL RCTFontStyle; +using RCTFontStyle = BOOL; RCT_ENUM_CONVERTER( RCTFontStyle, (@{ @@ -216,7 +216,7 @@ + (UIFont *)UIFont:(id)json NO, boolValue) -typedef NSDictionary RCTFontVariantDescriptor; +using RCTFontVariantDescriptor = NSDictionary; + (RCTFontVariantDescriptor *)RCTFontVariantDescriptor:(id)json { static NSDictionary *mapping; diff --git a/packages/react-native/ReactCommon/cxxreact/CxxModule.h b/packages/react-native/ReactCommon/cxxreact/CxxModule.h index fed1a7353a3b47..a825c401388abc 100644 --- a/packages/react-native/ReactCommon/cxxreact/CxxModule.h +++ b/packages/react-native/ReactCommon/cxxreact/CxxModule.h @@ -53,9 +53,9 @@ class CxxModule { class SyncTagType {}; public: - typedef std::function()> Provider; + using Provider = std::function()>; - typedef std::function)> Callback; + using Callback = std::function)>; constexpr static AsyncTagType AsyncTag = AsyncTagType(); constexpr static SyncTagType SyncTag = SyncTagType(); diff --git a/packages/react-native/ReactCommon/cxxreact/JsArgumentHelpers.h b/packages/react-native/ReactCommon/cxxreact/JsArgumentHelpers.h index 9a907017985c05..cf5343cb3e7348 100644 --- a/packages/react-native/ReactCommon/cxxreact/JsArgumentHelpers.h +++ b/packages/react-native/ReactCommon/cxxreact/JsArgumentHelpers.h @@ -68,8 +68,8 @@ namespace detail { // only for types compatible with folly::dynamic. template struct is_dynamic { - typedef typename std:: - enable_if::value, T>::type type; + using type = typename std:: + enable_if::value, T>::type; }; } // end namespace detail diff --git a/packages/react-native/ReactCommon/logger/react_native_log.h b/packages/react-native/ReactCommon/logger/react_native_log.h index 5f585efa4287c0..a05b4c6e6a31a7 100644 --- a/packages/react-native/ReactCommon/logger/react_native_log.h +++ b/packages/react-native/ReactCommon/logger/react_native_log.h @@ -14,7 +14,7 @@ enum ReactNativeLogLevel { ReactNativeLogLevelFatal = 4 }; -typedef void (*reactnativelogfunctype)(ReactNativeLogLevel, const char*); +using reactnativelogfunctype = void (*)(ReactNativeLogLevel, const char*); #ifdef __cplusplus extern "C" {