react-native-tvos 0.87.1-1 → 0.88.0-0rc2

package/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm

@@ -7,6 +7,7 @@
 
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
 #import <RCTTypeSafety/RCTConvertHelpers.h>
+#import <React/RCTConvert.h>
 #import <React/RCTInitializing.h>
 #import <React/RCTNativeAnimatedNodesManager.h>
 #import <React/RCTNativeAnimatedTurboModule.h>
@@ -75,143 +76,143 @@ RCT_EXPORT_MODULE();
 
 #pragma mark-- API
 
-RCT_EXPORT_METHOD(startOperationBatch) {}
+- (void)startOperationBatch
+{
+}
 
-RCT_EXPORT_METHOD(finishOperationBatch) {}
+- (void)finishOperationBatch
+{
+}
 
-RCT_EXPORT_METHOD(createAnimatedNode : (double)tag config : (NSDictionary<NSString *, id> *)config)
+- (void)createAnimatedNode:(double)tag config:(NSDictionary *)configJSON
 {
+  NSDictionary<NSString *, id> *config = [RCTConvert NSDictionary:configJSON];
   [self queueOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager createAnimatedNode:[NSNumber numberWithDouble:tag] config:config];
+    [nodesManager createAnimatedNode:@(tag) config:config];
   }];
 }
 
-RCT_EXPORT_METHOD(updateAnimatedNodeConfig : (double)tag config : (NSDictionary<NSString *, id> *)config)
+- (void)updateAnimatedNodeConfig:(double)tag config:(NSDictionary *)configJSON
 {
+  NSDictionary<NSString *, id> *config = [RCTConvert NSDictionary:configJSON];
   [self queueOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager updateAnimatedNodeConfig:[NSNumber numberWithDouble:tag] config:config];
+    [nodesManager updateAnimatedNodeConfig:@(tag) config:config];
   }];
 }
 
-RCT_EXPORT_METHOD(connectAnimatedNodes : (double)parentTag childTag : (double)childTag)
+- (void)connectAnimatedNodes:(double)parentTag childTag:(double)childTag
 {
   [self queueOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager connectAnimatedNodes:[NSNumber numberWithDouble:parentTag]
-                              childTag:[NSNumber numberWithDouble:childTag]];
+    [nodesManager connectAnimatedNodes:@(parentTag) childTag:@(childTag)];
   }];
 }
 
-RCT_EXPORT_METHOD(disconnectAnimatedNodes : (double)parentTag childTag : (double)childTag)
+- (void)disconnectAnimatedNodes:(double)parentTag childTag:(double)childTag
 {
   [self queueOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager disconnectAnimatedNodes:[NSNumber numberWithDouble:parentTag]
-                                 childTag:[NSNumber numberWithDouble:childTag]];
+    [nodesManager disconnectAnimatedNodes:@(parentTag) childTag:@(childTag)];
   }];
 }
 
-RCT_EXPORT_METHOD(
-    startAnimatingNode : (double)animationId nodeTag : (double)nodeTag config : (NSDictionary<NSString *, id> *)
-        config endCallback : (RCTResponseSenderBlock)callBack)
+- (void)startAnimatingNode:(double)animationId
+                   nodeTag:(double)nodeTag
+                    config:(NSDictionary *)configJSON
+               endCallback:(RCTResponseSenderBlock)callBack
 {
+  NSDictionary<NSString *, id> *config = [RCTConvert NSDictionary:configJSON];
   [self queueFlushedOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager startAnimatingNode:[NSNumber numberWithDouble:animationId]
-                             nodeTag:[NSNumber numberWithDouble:nodeTag]
-                              config:config
-                         endCallback:callBack];
+    [nodesManager startAnimatingNode:@(animationId) nodeTag:@(nodeTag) config:config endCallback:callBack];
   }];
 }
 
-RCT_EXPORT_METHOD(stopAnimation : (double)animationId)
+- (void)stopAnimation:(double)animationId
 {
   [self queueFlushedOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager stopAnimation:[NSNumber numberWithDouble:animationId]];
+    [nodesManager stopAnimation:@(animationId)];
   }];
 }
 
-RCT_EXPORT_METHOD(setAnimatedNodeValue : (double)nodeTag value : (double)value)
+- (void)setAnimatedNodeValue:(double)nodeTag value:(double)value
 {
   [self queueFlushedOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager setAnimatedNodeValue:[NSNumber numberWithDouble:nodeTag] value:[NSNumber numberWithDouble:value]];
+    [nodesManager setAnimatedNodeValue:@(nodeTag) value:@(value)];
   }];
 }
 
-RCT_EXPORT_METHOD(setAnimatedNodeOffset : (double)nodeTag offset : (double)offset)
+- (void)setAnimatedNodeOffset:(double)nodeTag offset:(double)offset
 {
   [self queueOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager setAnimatedNodeOffset:[NSNumber numberWithDouble:nodeTag] offset:[NSNumber numberWithDouble:offset]];
+    [nodesManager setAnimatedNodeOffset:@(nodeTag) offset:@(offset)];
   }];
 }
 
-RCT_EXPORT_METHOD(flattenAnimatedNodeOffset : (double)nodeTag)
+- (void)flattenAnimatedNodeOffset:(double)nodeTag
 {
   [self queueOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager flattenAnimatedNodeOffset:[NSNumber numberWithDouble:nodeTag]];
+    [nodesManager flattenAnimatedNodeOffset:@(nodeTag)];
   }];
 }
 
-RCT_EXPORT_METHOD(extractAnimatedNodeOffset : (double)nodeTag)
+- (void)extractAnimatedNodeOffset:(double)nodeTag
 {
   [self queueOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager extractAnimatedNodeOffset:[NSNumber numberWithDouble:nodeTag]];
+    [nodesManager extractAnimatedNodeOffset:@(nodeTag)];
   }];
 }
 
-RCT_EXPORT_METHOD(connectAnimatedNodeToView : (double)nodeTag viewTag : (double)viewTag)
+- (void)connectAnimatedNodeToView:(double)nodeTag viewTag:(double)viewTag
 {
   [self queueOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     // viewName is not used when node is managed by Fabric, and nodes are always managed by Fabric in Bridgeless.
-    [nodesManager connectAnimatedNodeToView:[NSNumber numberWithDouble:nodeTag]
-                                    viewTag:[NSNumber numberWithDouble:viewTag]
-                                   viewName:nil];
+    [nodesManager connectAnimatedNodeToView:@(nodeTag) viewTag:@(viewTag) viewName:nil];
   }];
 }
 
-RCT_EXPORT_METHOD(connectAnimatedNodeToShadowNodeFamily : (double)nodeTag shadowNode : (NSDictionary *)shadowNode)
+- (void)connectAnimatedNodeToShadowNodeFamily:(double)nodeTag shadowNode:(NSDictionary *)shadowNode
 {
   // This method should only be called when using CxxNativeAnimated
   react_native_assert(false);
 }
 
-RCT_EXPORT_METHOD(disconnectAnimatedNodeFromView : (double)nodeTag viewTag : (double)viewTag)
+- (void)disconnectAnimatedNodeFromView:(double)nodeTag viewTag:(double)viewTag
 {
   [self queueOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager disconnectAnimatedNodeFromView:[NSNumber numberWithDouble:nodeTag]
-                                         viewTag:[NSNumber numberWithDouble:viewTag]];
+    [nodesManager disconnectAnimatedNodeFromView:@(nodeTag) viewTag:@(viewTag)];
   }];
 }
 
-RCT_EXPORT_METHOD(restoreDefaultValues : (double)nodeTag)
+- (void)restoreDefaultValues:(double)nodeTag
 {
   [self queuePreOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager restoreDefaultValues:[NSNumber numberWithDouble:nodeTag]];
+    [nodesManager restoreDefaultValues:@(nodeTag)];
   }];
 }
 
-RCT_EXPORT_METHOD(dropAnimatedNode : (double)tag)
+- (void)dropAnimatedNode:(double)tag
 {
   [self queueOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager dropAnimatedNode:[NSNumber numberWithDouble:tag]];
+    [nodesManager dropAnimatedNode:@(tag)];
   }];
 }
 
-RCT_EXPORT_METHOD(startListeningToAnimatedNodeValue : (double)tag)
+- (void)startListeningToAnimatedNodeValue:(double)tag
 {
   __weak id<RCTValueAnimatedNodeObserver> valueObserver = self;
   [self queueOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager startListeningToAnimatedNodeValue:[NSNumber numberWithDouble:tag] valueObserver:valueObserver];
+    [nodesManager startListeningToAnimatedNodeValue:@(tag) valueObserver:valueObserver];
   }];
 }
 
-RCT_EXPORT_METHOD(stopListeningToAnimatedNodeValue : (double)tag)
+- (void)stopListeningToAnimatedNodeValue:(double)tag
 {
   [self queueOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager stopListeningToAnimatedNodeValue:[NSNumber numberWithDouble:tag]];
+    [nodesManager stopListeningToAnimatedNodeValue:@(tag)];
   }];
 }
 
-RCT_EXPORT_METHOD(
-    addAnimatedEventToView : (double)viewTag eventName : (nonnull NSString *)
-        eventName eventMapping : (JS::NativeAnimatedModule::EventMapping &)eventMapping)
+- (void)addAnimatedEventToView:(double)viewTag
+                     eventName:(nonnull NSString *)eventName
+                  eventMapping:(JS::NativeAnimatedModule::EventMapping &)eventMapping
 {
   NSMutableDictionary *eventMappingDict = [NSMutableDictionary new];
   eventMappingDict[@"nativeEventPath"] = RCTConvertVecToArray(eventMapping.nativeEventPath());
@@ -221,31 +222,27 @@ RCT_EXPORT_METHOD(
   }
 
   [self queueOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager addAnimatedEventToView:[NSNumber numberWithDouble:viewTag]
-                               eventName:eventName
-                            eventMapping:eventMappingDict];
+    [nodesManager addAnimatedEventToView:@(viewTag) eventName:eventName eventMapping:eventMappingDict];
   }];
 }
 
-RCT_EXPORT_METHOD(
-    removeAnimatedEventFromView : (double)viewTag eventName : (nonnull NSString *)eventName animatedNodeTag : (double)
-        animatedNodeTag)
+- (void)removeAnimatedEventFromView:(double)viewTag
+                          eventName:(nonnull NSString *)eventName
+                    animatedNodeTag:(double)animatedNodeTag
 {
   [self queueOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager removeAnimatedEventFromView:[NSNumber numberWithDouble:viewTag]
-                                    eventName:eventName
-                              animatedNodeTag:[NSNumber numberWithDouble:animatedNodeTag]];
+    [nodesManager removeAnimatedEventFromView:@(viewTag) eventName:eventName animatedNodeTag:@(animatedNodeTag)];
   }];
 }
 
-RCT_EXPORT_METHOD(getValue : (double)nodeTag saveValueCallback : (RCTResponseSenderBlock)saveValueCallback)
+- (void)getValue:(double)nodeTag saveValueCallback:(RCTResponseSenderBlock)saveValueCallback
 {
   [self queueOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
-    [nodesManager getValue:[NSNumber numberWithDouble:nodeTag] saveCallback:saveValueCallback];
+    [nodesManager getValue:@(nodeTag) saveCallback:saveValueCallback];
   }];
 }
 
-RCT_EXPORT_METHOD(queueAndExecuteBatchedOperations : (NSArray *)operationsAndArgs)
+- (void)queueAndExecuteBatchedOperations:(NSArray *)operationsAndArgs
 {
   // TODO: implement in the future if we want the same optimization here as on Android
 }

package/Libraries/NativeAnimation/React-RCTAnimation.podspec

@@ -52,4 +52,6 @@ Pod::Spec.new do |s|
 
   add_rn_third_party_dependencies(s)
   add_rncore_dependency(s)
+
+  mark_as_react_native_build(s)
 end

package/Libraries/NativeComponent/BaseViewConfig.android.js

@@ -221,8 +221,11 @@ const validAttributesForNonEventProps = {
   transformOrigin: true,
   backgroundImage: backgroundImageAttribute,
   experimental_backgroundImage: backgroundImageAttribute,
+  backgroundSize: backgroundSizeAttribute,
   experimental_backgroundSize: backgroundSizeAttribute,
+  backgroundPosition: backgroundPositionAttribute,
   experimental_backgroundPosition: backgroundPositionAttribute,
+  backgroundRepeat: backgroundRepeatAttribute,
   experimental_backgroundRepeat: backgroundRepeatAttribute,
   boxShadow: boxShadowAttribute,
   filter: filterAttribute,

package/Libraries/Network/RCTInspectorNetworkReporter.h

@@ -10,13 +10,16 @@
 #import <Foundation/Foundation.h>
 
 /**
- * [Experimental] An interface for reporting network events to the modern
- * debugger server and Web Performance APIs.
+ * An interface for reporting network events to the modern debugger server and
+ * Web Performance APIs.
  *
  * In a production (non dev or profiling) build, CDP reporting is disabled.
  *
- * This is a helper class wrapping
- * `facebook::react::jsinspector_modern::NetworkReporter`.
+ * This is a helper class wrapping `facebook::react::NetworkReporter`, and is
+ * the integration point for third-party networking stacks that replace React
+ * Native's networking modules.
+ *
+ * This is an unstable API. Its exact location and shape may change over time.
  */
 @interface RCTInspectorNetworkReporter : NSObject
 

package/Libraries/Network/RCTNetworking.mm

@@ -15,7 +15,6 @@
 #import <React/RCTUtils.h>
 
 #import <React/RCTHTTPRequestHandler.h>
-#import <react/featureflags/ReactNativeFeatureFlags.h>
 
 #import "RCTInspectorNetworkReporter.h"
 #import "RCTNetworkPlugins.h"
@@ -452,9 +451,7 @@ RCT_EXPORT_MODULE()
     __weak RCTNetworkTask *weakTask = task;
     return ^{
       [weakTask cancel];
-      if (facebook::react::ReactNativeFeatureFlags::enableNetworkEventReporting()) {
-        [RCTInspectorNetworkReporter reportRequestFailed:devToolsRequestId cancelled:YES];
-      }
+      [RCTInspectorNetworkReporter reportRequestFailed:devToolsRequestId cancelled:YES];
       if (cancellationBlock) {
         cancellationBlock();
       }
@@ -574,19 +571,17 @@ RCT_EXPORT_MODULE()
     }
   }
 
-  if (facebook::react::ReactNativeFeatureFlags::enableNetworkEventReporting()) {
-    id responseDataForPreview;
-    if ([responseType isEqualToString:@"blob"]) {
-      responseDataForPreview = data;
-    } else if ([responseData isKindOfClass:[NSString class]]) {
-      responseDataForPreview = responseData;
-    }
-    bool base64Encoded = [responseType isEqualToString:@"base64"] || [responseType isEqualToString:@"blob"];
-
-    [RCTInspectorNetworkReporter maybeStoreResponseBody:task.devToolsRequestId
-                                                   data:responseDataForPreview
-                                          base64Encoded:base64Encoded];
+  id responseDataForPreview;
+  if ([responseType isEqualToString:@"blob"]) {
+    responseDataForPreview = data;
+  } else if ([responseData isKindOfClass:[NSString class]]) {
+    responseDataForPreview = responseData;
   }
+  bool base64Encoded = [responseType isEqualToString:@"base64"] || [responseType isEqualToString:@"blob"];
+
+  [RCTInspectorNetworkReporter maybeStoreResponseBody:task.devToolsRequestId
+                                                 data:responseDataForPreview
+                                        base64Encoded:base64Encoded];
 
   [self sendEventWithName:@"didReceiveNetworkData" body:@[ task.requestID, responseData ]];
 }
@@ -620,12 +615,10 @@ RCT_EXPORT_MODULE()
     id responseURL = response.URL ? response.URL.absoluteString : [NSNull null];
     NSArray<id> *responseJSON = @[ task.requestID, @(status), headers, responseURL ];
 
-    if (facebook::react::ReactNativeFeatureFlags::enableNetworkEventReporting()) {
-      [RCTInspectorNetworkReporter reportResponseStart:task.devToolsRequestId
-                                              response:response
-                                            statusCode:status
-                                               headers:headers];
-    }
+    [RCTInspectorNetworkReporter reportResponseStart:task.devToolsRequestId
+                                            response:response
+                                          statusCode:status
+                                             headers:headers];
     [weakSelf sendEventWithName:@"didReceiveNetworkResponse" body:responseJSON];
   };
 
@@ -660,10 +653,8 @@ RCT_EXPORT_MODULE()
           @(total)
         ];
 
-        if (facebook::react::ReactNativeFeatureFlags::enableNetworkEventReporting()) {
-          [RCTInspectorNetworkReporter reportDataReceived:task.devToolsRequestId data:data];
-          [RCTInspectorNetworkReporter maybeStoreResponseBodyIncremental:task.devToolsRequestId data:responseString];
-        }
+        [RCTInspectorNetworkReporter reportDataReceived:task.devToolsRequestId data:data];
+        [RCTInspectorNetworkReporter maybeStoreResponseBodyIncremental:task.devToolsRequestId data:responseString];
         [weakSelf sendEventWithName:@"didReceiveNetworkIncrementalData" body:responseJSON];
       };
     } else {
@@ -700,12 +691,10 @@ RCT_EXPORT_MODULE()
     NSArray *responseJSON =
         @[ task.requestID, RCTNullIfNil(error.localizedDescription), error.code == kCFURLErrorTimedOut ? @YES : @NO ];
 
-    if (facebook::react::ReactNativeFeatureFlags::enableNetworkEventReporting()) {
-      if (error != nullptr) {
-        [RCTInspectorNetworkReporter reportRequestFailed:task.devToolsRequestId cancelled:NO];
-      } else {
-        [RCTInspectorNetworkReporter reportResponseEnd:task.devToolsRequestId encodedDataLength:data.length];
-      }
+    if (error != nullptr) {
+      [RCTInspectorNetworkReporter reportRequestFailed:task.devToolsRequestId cancelled:NO];
+    } else {
+      [RCTInspectorNetworkReporter reportResponseEnd:task.devToolsRequestId encodedDataLength:data.length];
     }
     [strongSelf sendEventWithName:@"didCompleteNetworkResponse" body:responseJSON];
     [strongSelf->_tasksByRequestID removeObjectForKey:task.requestID];
@@ -723,12 +712,10 @@ RCT_EXPORT_MODULE()
     }
     _tasksByRequestID[task.requestID] = task;
     responseSender(@[ task.requestID ]);
-    if (facebook::react::ReactNativeFeatureFlags::enableNetworkEventReporting()) {
-      [RCTInspectorNetworkReporter reportRequestStart:task.devToolsRequestId
-                                              request:request
-                                    encodedDataLength:task.response.expectedContentLength];
-      [RCTInspectorNetworkReporter reportConnectionTiming:task.devToolsRequestId request:task.request];
-    }
+    [RCTInspectorNetworkReporter reportRequestStart:task.devToolsRequestId
+                                            request:request
+                                  encodedDataLength:task.response.expectedContentLength];
+    [RCTInspectorNetworkReporter reportConnectionTiming:task.devToolsRequestId request:task.request];
   }
 
   [task start];
@@ -796,9 +783,8 @@ RCT_EXPORT_MODULE()
 
 #pragma mark - JS API
 
-RCT_EXPORT_METHOD(
-    sendRequest : (JS::NativeNetworkingIOS::SpecSendRequestQuery &)query callback : (RCTResponseSenderBlock)
-        responseSender)
+- (void)sendRequest:(JS::NativeNetworkingIOS::SpecSendRequestQuery &)query
+           callback:(RCTResponseSenderBlock)responseSender
 {
   NSString *method = query.method();
   NSString *url = query.url();
@@ -839,15 +825,15 @@ RCT_EXPORT_METHOD(
   });
 }
 
-RCT_EXPORT_METHOD(abortRequest : (double)requestID)
+- (void)abortRequest:(double)requestID
 {
   dispatch_async(_methodQueue, ^{
     [self->_tasksByRequestID[[NSNumber numberWithDouble:requestID]] cancel];
-    [self->_tasksByRequestID removeObjectForKey:[NSNumber numberWithDouble:requestID]];
+    [self->_tasksByRequestID removeObjectForKey:@(requestID)];
   });
 }
 
-RCT_EXPORT_METHOD(clearCookies : (RCTResponseSenderBlock)responseSender)
+- (void)clearCookies:(RCTResponseSenderBlock)responseSender
 {
   dispatch_async(_methodQueue, ^{
     NSHTTPCookieStorage *storage = [NSHTTPCookieStorage sharedHTTPCookieStorage];

package/Libraries/Network/React-RCTNetwork.podspec

@@ -54,4 +54,6 @@ Pod::Spec.new do |s|
 
   add_rn_third_party_dependencies(s)
   add_rncore_dependency(s)
+
+  mark_as_react_native_build(s)
 end

package/Libraries/Network/XMLHttpRequest.js

@@ -34,12 +34,7 @@ const DEBUG_NETWORK_SEND_DELAY: false = false; // Set to a number of millisecond
 
 export type NativeResponseType = 'base64' | 'blob' | 'text';
 export type ResponseType =
-  | ''
-  | 'arraybuffer'
-  | 'blob'
-  | 'document'
-  | 'json'
-  | 'text';
+  '' | 'arraybuffer' | 'blob' | 'document' | 'json' | 'text';
 export type Response = ?Object | string;
 
 type XHRInterceptor = interface {
@@ -518,7 +513,10 @@ class XMLHttpRequest extends EventTarget {
     if (this.readyState !== this.OPENED) {
       throw new Error('Request has not been opened');
     }
-    this._headers[header.toLowerCase()] = String(value);
+    const key = header.toLowerCase();
+    const existing = this._headers[key];
+    this._headers[key] =
+      existing !== undefined ? existing + ', ' + String(value) : String(value);
   }
 
   /**
@@ -658,13 +656,11 @@ class XMLHttpRequest extends EventTarget {
     }
     // only call onreadystatechange if there is something to abort,
     // below logic is per spec
-    if (
-      !(
-        this.readyState === this.UNSENT ||
-        (this.readyState === this.OPENED && !this._sent) ||
-        this.readyState === this.DONE
-      )
-    ) {
+    if (!(
+      this.readyState === this.UNSENT ||
+      (this.readyState === this.OPENED && !this._sent) ||
+      this.readyState === this.DONE
+    )) {
       this._reset();
       this.setReadyState(this.DONE);
     }

package/Libraries/Pressability/HoverState.js

@@ -19,9 +19,9 @@ let isEnabled = false;
 if (Platform.OS === 'web') {
   const canUseDOM = Boolean(
     typeof window !== 'undefined' &&
-      window.document &&
-      // $FlowFixMe[method-unbinding]
-      window.document.createElement,
+    window.document &&
+    // $FlowFixMe[method-unbinding]
+    window.document.createElement,
   );
 
   if (canUseDOM) {

package/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm

@@ -305,7 +305,7 @@ RCT_EXPORT_MODULE()
   [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,22 +320,33 @@ RCT_EXPORT_METHOD(onFinishRemoteNotification : (NSString *)notificationId fetchR
 /**
  * Update the application icon badge number on the home screen
  */
-RCT_EXPORT_METHOD(setApplicationIconBadgeNumber : (double)number)
-{
-  RCTSharedApplication().applicationIconBadgeNumber = number;
+- (void)setApplicationIconBadgeNumber:(double)number
+{
+  NSInteger badgeCount = (NSInteger)lround(number);
+  if (@available(iOS 16.0, *)) {
+    [UNUserNotificationCenter.currentNotificationCenter
+                setBadgeCount:badgeCount
+        withCompletionHandler:^(NSError *_Nullable error) {
+          if (error != nil) {
+            RCTLogWarn(@"Failed to set application icon badge number: %@", error);
+          }
+        }];
+  } else {
+    RCTSharedApplication().applicationIconBadgeNumber = badgeCount;
+  }
 }
 
 /**
  * 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(
@@ -378,12 +389,12 @@ RCT_EXPORT_METHOD(
                     }];
 }
 
-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) ]);
@@ -433,7 +444,7 @@ static inline NSDictionary *RCTSettingsDictForUNNotificationSettings(
   };
 }
 
-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];
@@ -447,7 +458,7 @@ RCT_EXPORT_METHOD(presentLocalNotification : (JS::NativePushNotificationManagerI
   [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];
@@ -475,7 +486,7 @@ RCT_EXPORT_METHOD(scheduleLocalNotification : (JS::NativePushNotificationManager
   [center addNotificationRequest:request withCompletionHandler:nil];
 }
 
-RCT_EXPORT_METHOD(cancelAllLocalNotifications)
+- (void)cancelAllLocalNotifications
 {
   [[UNUserNotificationCenter currentNotificationCenter]
       getPendingNotificationRequestsWithCompletionHandler:^(NSArray<UNNotificationRequest *> *requests) {
@@ -488,9 +499,10 @@ RCT_EXPORT_METHOD(cancelAllLocalNotifications)
       }];
 }
 
-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];
@@ -518,8 +530,7 @@ RCT_EXPORT_METHOD(cancelLocalNotifications : (NSDictionary<NSString *, id> *)use
 #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
@@ -542,7 +553,7 @@ RCT_EXPORT_METHOD(
   resolve((id)kCFNull);
 }
 
-RCT_EXPORT_METHOD(getScheduledLocalNotifications : (RCTResponseSenderBlock)callback)
+- (void)getScheduledLocalNotifications:(RCTResponseSenderBlock)callback
 {
   UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
   [center getPendingNotificationRequestsWithCompletionHandler:^(NSArray<UNNotificationRequest *> *_Nonnull requests) {
@@ -554,7 +565,7 @@ RCT_EXPORT_METHOD(getScheduledLocalNotifications : (RCTResponseSenderBlock)callb
   }];
 }
 
-RCT_EXPORT_METHOD(removeAllDeliveredNotifications)
+- (void)removeAllDeliveredNotifications
 {
 #if !TARGET_OS_TV
   UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
@@ -562,15 +573,16 @@ RCT_EXPORT_METHOD(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];
@@ -587,7 +599,7 @@ RCT_EXPORT_METHOD(getDeliveredNotifications : (RCTResponseSenderBlock)callback)
 #endif
 }
 
-RCT_EXPORT_METHOD(getAuthorizationStatus : (RCTResponseSenderBlock)callback)
+- (void)getAuthorizationStatus:(RCTResponseSenderBlock)callback
 {
   UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
   [center getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings *_Nonnull settings) {

package/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec

@@ -50,4 +50,6 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-NativeModulesApple")
 
   add_rncore_dependency(s)
+
+  mark_as_react_native_build(s)
 end