Merge branch 'react:main' into fix/percentage-border-radius-view-managers

Author: sbaiahmed1

packages/react-native/Libraries/Image/RCTImageStoreManager.mm

@@ -95,20 +95,20 @@ - (void)storeImage:(UIImage *)image withBlock:(void (^)(NSString *imageTag))bloc
   });
 }
 
-RCT_EXPORT_METHOD(removeImageForTag : (NSString *)imageTag)
+- (void)removeImageForTag:(NSString *)imageTag
 {
   [_store removeObjectForKey:imageTag];
 }
 
-RCT_EXPORT_METHOD(hasImageForTag : (NSString *)imageTag callback : (RCTResponseSenderBlock)callback)
+- (void)hasImageForTag:(NSString *)imageTag callback:(RCTResponseSenderBlock)callback
 {
   callback(@[ @(_store[imageTag] != nil) ]);
 }
 
 // TODO (#5906496): Name could be more explicit - something like getBase64EncodedDataForTag:?
-RCT_EXPORT_METHOD(
-    getBase64ForTag : (NSString *)imageTag successCallback : (RCTResponseSenderBlock)
-        successCallback errorCallback : (RCTResponseSenderBlock)errorCallback)
+- (void)getBase64ForTag:(NSString *)imageTag
+        successCallback:(RCTResponseSenderBlock)successCallback
+          errorCallback:(RCTResponseSenderBlock)errorCallback
 {
   NSData *imageData = _store[imageTag];
   if (imageData == nullptr) {
@@ -122,9 +122,9 @@ - (void)storeImage:(UIImage *)image withBlock:(void (^)(NSString *imageTag))bloc
   });
 }
 
-RCT_EXPORT_METHOD(
-    addImageFromBase64 : (NSString *)base64String successCallback : (RCTResponseSenderBlock)
-        successCallback errorCallback : (RCTResponseSenderBlock)errorCallback)
+- (void)addImageFromBase64:(NSString *)base64String
+           successCallback:(RCTResponseSenderBlock)successCallback
+             errorCallback:(RCTResponseSenderBlock)errorCallback
 
 {
   // Dispatching to a background thread to perform base64 decoding

packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm

@@ -305,7 +305,7 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
   [self sendEventWithName:@"remoteNotificationRegistrationError" body:errorDetails];
 }
 
-RCT_EXPORT_METHOD(onFinishRemoteNotification : (NSString *)notificationId fetchResult : (NSString *)fetchResult)
+- (void)onFinishRemoteNotification:(NSString *)notificationId fetchResult:(NSString *)fetchResult
 {
   UIBackgroundFetchResult result = [RCTConvert UIBackgroundFetchResult:fetchResult];
   RCTRemoteNotificationCallback completionHandler = self.remoteNotificationCallbacks[notificationId];
@@ -320,7 +320,7 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
 /**
  * Update the application icon badge number on the home screen
  */
-RCT_EXPORT_METHOD(setApplicationIconBadgeNumber : (double)number)
+- (void)setApplicationIconBadgeNumber:(double)number
 {
   NSInteger badgeCount = (NSInteger)lround(number);
   if (@available(iOS 16.0, *)) {
@@ -339,14 +339,14 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
 /**
  * Get the current application icon badge number on the home screen
  */
-RCT_EXPORT_METHOD(getApplicationIconBadgeNumber : (RCTResponseSenderBlock)callback)
+- (void)getApplicationIconBadgeNumber:(RCTResponseSenderBlock)callback
 {
   callback(@[ @(RCTSharedApplication().applicationIconBadgeNumber) ]);
 }
 
-RCT_EXPORT_METHOD(
-    requestPermissions : (JS::NativePushNotificationManagerIOS::SpecRequestPermissionsPermission &)
-        permissions resolve : (RCTPromiseResolveBlock)resolve reject : (RCTPromiseRejectBlock)reject)
+- (void)requestPermissions:(JS::NativePushNotificationManagerIOS::SpecRequestPermissionsPermission &)permissions
+                   resolve:(RCTPromiseResolveBlock)resolve
+                    reject:(RCTPromiseRejectBlock)reject
 {
   if (RCTRunningInAppExtension()) {
     reject(
@@ -389,12 +389,12 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
                     }];
 }
 
-RCT_EXPORT_METHOD(abandonPermissions)
+- (void)abandonPermissions
 {
   [RCTSharedApplication() unregisterForRemoteNotifications];
 }
 
-RCT_EXPORT_METHOD(checkPermissions : (RCTResponseSenderBlock)callback)
+- (void)checkPermissions:(RCTResponseSenderBlock)callback
 {
   if (RCTRunningInAppExtension()) {
     callback(@[ RCTSettingsDictForUNNotificationSettings(NO, NO, NO, NO, NO, NO, UNAuthorizationStatusNotDetermined) ]);
@@ -444,7 +444,7 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
   };
 }
 
-RCT_EXPORT_METHOD(presentLocalNotification : (JS::NativePushNotificationManagerIOS::Notification &)notification)
+- (void)presentLocalNotification:(JS::NativePushNotificationManagerIOS::Notification &)notification
 {
   NSDictionary<NSString *, id> *notificationDict = [RCTConvert NSDictionaryForNotification:notification];
   UNNotificationContent *content = [RCTConvert UNNotificationContent:notificationDict];
@@ -458,7 +458,7 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
   [center addNotificationRequest:request withCompletionHandler:nil];
 }
 
-RCT_EXPORT_METHOD(scheduleLocalNotification : (JS::NativePushNotificationManagerIOS::Notification &)notification)
+- (void)scheduleLocalNotification:(JS::NativePushNotificationManagerIOS::Notification &)notification
 {
   NSDictionary<NSString *, id> *notificationDict = [RCTConvert NSDictionaryForNotification:notification];
   UNNotificationContent *content = [RCTConvert UNNotificationContent:notificationDict];
@@ -486,7 +486,7 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
   [center addNotificationRequest:request withCompletionHandler:nil];
 }
 
-RCT_EXPORT_METHOD(cancelAllLocalNotifications)
+- (void)cancelAllLocalNotifications
 {
   [[UNUserNotificationCenter currentNotificationCenter]
       getPendingNotificationRequestsWithCompletionHandler:^(NSArray<UNNotificationRequest *> *requests) {
@@ -499,9 +499,10 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
       }];
 }
 
-RCT_EXPORT_METHOD(cancelLocalNotifications : (NSDictionary<NSString *, id> *)userInfo)
+- (void)cancelLocalNotifications:(NSDictionary *)userInfoRaw
 {
 #if !TARGET_OS_TV
+  NSDictionary<NSString *, id> *userInfo = [RCTConvert NSDictionary:userInfoRaw];
   UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
   [center getPendingNotificationRequestsWithCompletionHandler:^(NSArray<UNNotificationRequest *> *_Nonnull requests) {
     NSMutableArray<NSString *> *notificationIdentifiersToCancel = [NSMutableArray new];
@@ -529,8 +530,7 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
 #endif
 }
 
-RCT_EXPORT_METHOD(
-    getInitialNotification : (RCTPromiseResolveBlock)resolve reject : (__unused RCTPromiseRejectBlock)reject)
+- (void)getInitialNotification:(RCTPromiseResolveBlock)resolve reject:(__unused RCTPromiseRejectBlock)reject
 {
   // The user actioned a local or remote notification to launch the app. Notification is represented by UNNotification.
   // Set this property in the implementation of
@@ -553,7 +553,7 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
   resolve((id)kCFNull);
 }
 
-RCT_EXPORT_METHOD(getScheduledLocalNotifications : (RCTResponseSenderBlock)callback)
+- (void)getScheduledLocalNotifications:(RCTResponseSenderBlock)callback
 {
   UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
   [center getPendingNotificationRequestsWithCompletionHandler:^(NSArray<UNNotificationRequest *> *_Nonnull requests) {
@@ -565,23 +565,24 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
   }];
 }
 
-RCT_EXPORT_METHOD(removeAllDeliveredNotifications)
+- (void)removeAllDeliveredNotifications
 {
 #if !TARGET_OS_TV
   UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
   [center removeAllDeliveredNotifications];
 #endif
 }
 
-RCT_EXPORT_METHOD(removeDeliveredNotifications : (NSArray<NSString *> *)identifiers)
+- (void)removeDeliveredNotifications:(NSArray *)identifiersRaw
 {
 #if !TARGET_OS_TV
+  NSArray<NSString *> *identifiers = [RCTConvert NSStringArray:identifiersRaw];
   UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
   [center removeDeliveredNotificationsWithIdentifiers:identifiers];
 #endif
 }
 
-RCT_EXPORT_METHOD(getDeliveredNotifications : (RCTResponseSenderBlock)callback)
+- (void)getDeliveredNotifications:(RCTResponseSenderBlock)callback
 {
 #if !TARGET_OS_TV
   UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
@@ -598,7 +599,7 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
 #endif
 }
 
-RCT_EXPORT_METHOD(getAuthorizationStatus : (RCTResponseSenderBlock)callback)
+- (void)getAuthorizationStatus:(RCTResponseSenderBlock)callback
 {
   UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
   [center getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings *_Nonnull settings) {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.kt

@@ -141,7 +141,7 @@ public constructor(
 
   @Deprecated(
       "Retained only for binary/source compatibility; the defaultSource prop is now delivered " +
-          "through the Dynamic overload."
+          "through the Dynamic overload.",
   )
   public fun setDefaultSource(view: ReactImageView, source: String?) {
     view.setDefaultSource(source)
@@ -155,7 +155,7 @@ public constructor(
 
   @Deprecated(
       "Retained only for binary/source compatibility; the loadingIndicatorSrc prop is now " +
-          "delivered through the Dynamic overload."
+          "delivered through the Dynamic overload.",
   )
   public fun setLoadingIndicatorSource(view: ReactImageView, source: String?) {
     view.setLoadingIndicatorSource(source)