Merge branch 'main' into yarn4

microsoft · Jan 23, 2024 · 7328838 · 7328838
2 parents a083bc5 + 4448130
commit 7328838
Show file tree

Hide file tree

Showing 21 changed files with 332 additions and 394 deletions.
diff --git a/.ado/Brewfile.lock.json b/.ado/Brewfile.lock.json
diff --git a/.ado/templates/apple-tools-setup.yml b/.ado/templates/apple-tools-setup.yml
@@ -3,8 +3,12 @@ steps:
     inputs:
       versionSpec: '18.x'
 
-  - script: 'brew bundle --file .ado/Brewfile'
+  - task: CmdLine@2
     displayName: 'brew bundle'
+    inputs:
+      script: |
+        brew bundle --file .ado/Brewfile
+        cat .ado/Brewfile.lock.json
 
   - ${{ if ne(parameters.xcode_version, '')}}:
     - template: apple-xcode-select.yml

diff --git a/packages/react-native/Libraries/PushNotificationIOS/NativePushNotificationManagerIOS.js b/packages/react-native/Libraries/PushNotificationIOS/NativePushNotificationManagerIOS.js
@@ -20,17 +20,45 @@ type Permissions = {|
 
 type Notification = {|
   +alertTitle?: ?string,
-  // Actual type: string | number
-  +fireDate?: ?number,
   +alertBody?: ?string,
-  +alertAction?: ?string,
   +userInfo?: ?Object,
+  /**
+   * Identifier for the notification category. See the [Apple documentation](https://developer.apple.com/documentation/usernotifications/declaring_your_actionable_notification_types)
+   * for more details.
+   */
   +category?: ?string,
-  // Actual type: 'year' | 'month' | 'week' | 'day' | 'hour' | 'minute'
-  +repeatInterval?: ?string,
+  /**
+   * Actual type: string | number
+   *
+   * Schedule notifications using EITHER `fireDate` or `fireIntervalSeconds`.
+   * If both are specified, `fireDate` takes precedence.
+   * If you use `presentLocalNotification`, both will be ignored
+   * and the notification will be shown immediately.
+   */
+  +fireDate?: ?number,
+  /**
+   * Seconds from now to display the notification.
+   *
+   * Schedule notifications using EITHER `fireDate` or `fireIntervalSeconds`.
+   * If both are specified, `fireDate` takes precedence.
+   * If you use `presentLocalNotification`, both will be ignored
+   * and the notification will be shown immediately.
+   */
+  +fireIntervalSeconds?: ?number,
+  /** Badge count to display on the app icon. */
   +applicationIconBadgeNumber?: ?number,
+  /** Whether to silence the notification sound. */
   +isSilent?: ?boolean,
+  /**
+   * Custom notification sound to play. Write-only: soundName will be null when
+   * accessing already created notifications using getScheduledLocalNotifications
+   * or getDeliveredNotifications.
+   */
   +soundName?: ?string,
+  /** DEPRECATED. This was used for iOS's legacy UILocalNotification. */
+  +alertAction?: ?string,
+  /** DEPRECATED. Use `fireDate` or `fireIntervalSeconds` instead. */
+  +repeatInterval?: ?string,
 |};
 
 export interface Spec extends TurboModule {

diff --git a/packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.h b/packages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.h
@@ -16,9 +16,6 @@ typedef void (^RCTRemoteNotificationCallback)(UIBackgroundFetchResult result);
 #endif // [macOS]
 
 #if !TARGET_OS_UIKITFORMAC
-#if !TARGET_OS_OSX // [macOS]
-+ (void)didRegisterUserNotificationSettings:(UIUserNotificationSettings *)notificationSettings;
-#endif // [macOS]
 + (void)didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken;
 + (void)didReceiveRemoteNotification:(NSDictionary *)notification;
 #if !TARGET_OS_OSX // [macOS]