Merge branch 'main' into keyDownEvents

.ado/jobs/build-test-rntester.yml

@@ -98,6 +98,18 @@ jobs:
         steps:
         - template: /.ado/templates/apple-tools-setup.yml@self
 
+        - ${{ if in(slice.sdk, 'xros', 'xrsimulator') }}:
+            - task: CmdLine@2
+              displayName: Download visionOS SDDK
+              inputs:
+                script: |
+                  set -eox pipefail
+                  # https://github.com/actions/runner-images/issues/10559
+                  sudo xcodebuild -runFirstLaunch
+                  sudo xcrun simctl list
+                  sudo xcodebuild -downloadPlatform visionOS
+                  sudo xcodebuild -runFirstLaunch
+
         - task: CmdLine@2
           displayName: yarn install
           inputs:

.ado/jobs/test-react-native-macos-init.yml

@@ -13,6 +13,22 @@ jobs:
 
       - template: /.ado/templates/apple-tools-setup.yml@self
 
+      - task: CmdLine@2
+        displayName: yarn install react-native-macos-init
+        inputs:
+          script: |
+            set -eox pipefail
+            cd packages/react-native-macos-init
+            yarn install
+
+      - task: CmdLine@2
+        displayName: Build react-native-macos-init
+        inputs:
+          script: |
+            set -eox pipefail
+            cd packages/react-native-macos-init
+            yarn build
+
       - template: /.ado/templates/verdaccio-init.yml@self
 
       - template: /.ado/templates/verdaccio-publish.yml@self
@@ -21,42 +37,56 @@ jobs:
       - task: CmdLine@2
         displayName: yarn install (local react-native-macos)
         inputs:
-          script: yarn install --immutable
+          script:  |
+            set -eox pipefail
+            yarn install --immutable
 
       - task: CmdLine@2
         displayName: yarn install (local react-native-macos-init)
         inputs:
           script: |
+            set -eox pipefail
             cd packages/react-native-macos-init
             yarn install --immutable
 
       - task: CmdLine@2
         displayName: yarn build (local react-native-macos-init)
         inputs:
           script: |
+            set -eox pipefail
             cd packages/react-native-macos-init
             yarn build
 
       - task: CmdLine@2
         displayName: Init new project
         inputs:
-          script: npx --yes [email protected] init testcli --template [email protected] --skip-install
+          script: |
+            set -eox pipefail
+            npx --yes @react-native-community/cli init testcli --version 0.75 --skip-install
           workingDirectory: $(Agent.BuildDirectory)
 
       - task: CmdLine@2
-        displayName: yarn install (local react-native-macos-init)
+        displayName: yarn install (testcli)
         inputs:
-          script: yarn install --immutable
+          script: |
+            set -eox pipefail
+            yarn install --mode=update-lockfile
+            # `update-lockfile` skips the linking step, so we need to run `yarn install` again
+            yarn install
           workingDirectory: $(Agent.BuildDirectory)/testcli
 
       - task: CmdLine@2
         displayName: Apply macos template
         inputs:
-          script: npx react-native-macos-init --version latest --overwrite --prerelease
+          script: |
+            set -eox pipefail
+            npx react-native-macos-init --version latest --overwrite --prerelease
           workingDirectory: $(Agent.BuildDirectory)/testcli
 
       - task: CmdLine@2
         displayName: Run macos [test]
         inputs:
-          script: npx react-native run-macos
+          script: |
+            set -eox pipefail
+            npx react-native run-macos
           workingDirectory: $(Agent.BuildDirectory)/testcli

packages/helloworld/Gemfile.lock

@@ -76,19 +76,21 @@ GEM
     netrc (0.11.0)
     nkf (0.2.0)
     public_suffix (4.0.7)
-    rexml (3.2.6)
+    rexml (3.3.6)
+      strscan
     ruby-macho (2.5.1)
+    strscan (3.1.0)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    xcodeproj (1.24.0)
+    xcodeproj (1.25.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
-      rexml (~> 3.2.4)
+      rexml (>= 3.3.2, < 4.0)
     zeitwerk (2.6.13)
 
 PLATFORMS

packages/react-native-macos-init/CHANGELOG.json

@@ -1,6 +1,21 @@
 {
   "name": "react-native-macos-init",
   "entries": [
+    {
+      "date": "Tue, 15 Oct 2024 20:02:42 GMT",
+      "version": "2.1.3",
+      "tag": "react-native-macos-init_v2.1.3",
+      "comments": {
+        "patch": [
+          {
+            "author": "[email protected]",
+            "package": "react-native-macos-init",
+            "commit": "b86ac5239832d7d72e22cb84b1878ce2f73138fe",
+            "comment": "fix: Properly import `npm-registry-fetch` in `react-native-macos-init`"
+          }
+        ]
+      }
+    },
     {
       "date": "Mon, 18 May 2020 23:31:12 GMT",
       "tag": "react-native-macos-init_v2.1.0",

packages/react-native-macos-init/CHANGELOG.md

@@ -1,9 +1,17 @@
 # Change Log - react-native-macos-init
 
-This log was last generated on Mon, 18 May 2020 23:31:12 GMT and should not be manually modified.
+This log was last generated on Tue, 15 Oct 2024 20:02:42 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 2.1.3
+
+Tue, 15 Oct 2024 20:02:42 GMT
+
+### Patches
+
+- fix: Properly import `npm-registry-fetch` in `react-native-macos-init` ([email protected])
+
 ## 2.1.0
 
 Mon, 18 May 2020 23:31:12 GMT

packages/react-native-macos-init/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-macos-init",
-  "version": "2.1.0",
+  "version": "2.1.3",
   "description": "CLI to add react-native-macos to an existing react-native project",
   "main": "index.js",
   "repository": "https://github.com/microsoft/react-native-macos",

packages/react-native-macos-init/src/cli.ts

@@ -13,8 +13,7 @@ import * as validUrl from 'valid-url';
 import * as prompts from 'prompts';
 import * as findUp from 'find-up';
 import * as chalk from 'chalk';
-// @ts-ignore
-import npmFetch from 'npm-registry';
+import * as npmFetch from 'npm-registry-fetch';
 
 const npmConfReg = execSync('npm config get registry').toString().trim();
 const NPM_REGISTRY_URL = validUrl.isUri(npmConfReg)

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

@@ -25,23 +25,22 @@
 
   // convert to ARGB if it isn't
   if (CGImageGetBitsPerPixel(imageRef) != 32 || !((CGImageGetBitmapInfo(imageRef) & kCGBitmapAlphaInfoMask))) {
-#if !TARGET_OS_OSX // [macOS]
-    UIGraphicsImageRendererFormat *const rendererFormat = [UIGraphicsImageRendererFormat defaultFormat];
-    rendererFormat.scale = inputImage.scale;
-    UIGraphicsImageRenderer *const renderer = [[UIGraphicsImageRenderer alloc] initWithSize:inputImage.size
-                                                                                     format:rendererFormat];
+    RCTUIGraphicsImageRendererFormat *const rendererFormat = [RCTUIGraphicsImageRendererFormat defaultFormat]; // [macOS]
+    rendererFormat.scale = UIImageGetScale(inputImage); // [macOS]
+    RCTUIGraphicsImageRenderer *const renderer = [[RCTUIGraphicsImageRenderer alloc] initWithSize:inputImage.size // [macOS]
+                                                                                           format:rendererFormat];
 
+#if !TARGET_OS_OSX // [macOS]
     imageRef = [renderer imageWithActions:^(UIGraphicsImageRendererContext *_Nonnull context) {
                  [inputImage drawAtPoint:CGPointZero];
                }].CGImage;
 #else // [macOS
-    UIGraphicsBeginImageContextWithOptions(inputImage.size, NO, imageScale);
-    [inputImage drawAtPoint:CGPointZero fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1.0];
-    imageRef = (CGImageRef)CFAutorelease(CGBitmapContextCreateImage(UIGraphicsGetCurrentContext()));
-    UIGraphicsEndImageContext();
+    NSImage *image = [renderer imageWithActions:^(RCTUIGraphicsImageRendererContext *_Nonnull context) {
+      [inputImage drawAtPoint:CGPointZero fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1.0];
+    }];
+    imageRef = UIImageGetCGImageRef(image);
 #endif // macOS]
   }
-
   vImage_Buffer buffer1, buffer2;
   buffer1.width = buffer2.width = CGImageGetWidth(imageRef);
   buffer1.height = buffer2.height = CGImageGetHeight(imageRef);

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

@@ -382,25 +382,19 @@ BOOL RCTUpscalingRequired(
   }
 
   BOOL opaque = !RCTUIImageHasAlpha(image); // [macOS]
-#if !TARGET_OS_OSX // [macOS]
-  UIGraphicsImageRendererFormat *const rendererFormat = [UIGraphicsImageRendererFormat defaultFormat];
+  RCTUIGraphicsImageRendererFormat *const rendererFormat = [RCTUIGraphicsImageRendererFormat defaultFormat]; // [macOS]
   rendererFormat.opaque = opaque;
   rendererFormat.scale = destScale;
-  UIGraphicsImageRenderer *const renderer = [[UIGraphicsImageRenderer alloc] initWithSize:destSize
+  RCTUIGraphicsImageRenderer *const renderer = [[RCTUIGraphicsImageRenderer alloc] initWithSize:destSize // [macOS]
                                                                                    format:rendererFormat];
-  return [renderer imageWithActions:^(UIGraphicsImageRendererContext *_Nonnull context) {
+  return [renderer imageWithActions:^(RCTUIGraphicsImageRendererContext *_Nonnull context) { // [macOS]
     CGContextConcatCTM(context.CGContext, transform);
+#if !TARGET_OS_OSX // [macOS]
     [image drawAtPoint:CGPointZero];
-  }];
 #else // [macOS
-  UIGraphicsBeginImageContextWithOptions(destSize, opaque, destScale);
-  CGContextRef currentContext = UIGraphicsGetCurrentContext();
-  CGContextConcatCTM(currentContext, transform);
-  [image drawAtPoint:CGPointZero fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1.0];
-  UIImage *result = UIGraphicsGetImageFromCurrentImageContext();
-  UIGraphicsEndImageContext();
-  return result;
+    [image drawAtPoint:CGPointZero fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1.0];
 #endif // macOS]
+  }];
 }
 
 BOOL RCTImageHasAlpha(CGImageRef image)

packages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm

@@ -587,7 +587,7 @@ - (void)deleteBackward {
 }
 #else // [macOS
 - (BOOL)performKeyEquivalent:(NSEvent *)event {
-  if (!self.hasMarkedText && ![self.textInputDelegate textInputShouldHandleKeyEvent:event]) {
+  if (self.window.firstResponder == self && !self.hasMarkedText && ![self.textInputDelegate textInputShouldHandleKeyEvent:event]) {
     return YES;
   }
 

packages/react-native/React/Base/RCTUIKit.h

@@ -269,9 +269,6 @@ extern "C" {
 
 // UIGraphics.h
 CGContextRef UIGraphicsGetCurrentContext(void);
-void UIGraphicsBeginImageContextWithOptions(CGSize size, BOOL opaque, CGFloat scale);
-NSImage *UIGraphicsGetImageFromCurrentImageContext(void);
-void UIGraphicsEndImageContext(void);
 CGImageRef UIImageGetCGImageRef(NSImage *image);
 
 #ifdef __cplusplus
@@ -641,3 +638,31 @@ NS_ASSUME_NONNULL_BEGIN
 NS_ASSUME_NONNULL_END
 @end
 #endif
+
+#if !TARGET_OS_OSX
+typedef UIGraphicsImageRendererContext RCTUIGraphicsImageRendererContext;
+typedef UIGraphicsImageDrawingActions RCTUIGraphicsImageDrawingActions;
+typedef UIGraphicsImageRendererFormat RCTUIGraphicsImageRendererFormat;
+typedef UIGraphicsImageRenderer RCTUIGraphicsImageRenderer;
+#else
+NS_ASSUME_NONNULL_BEGIN
+typedef NSGraphicsContext RCTUIGraphicsImageRendererContext;
+typedef void (^RCTUIGraphicsImageDrawingActions)(RCTUIGraphicsImageRendererContext *rendererContext);
+
+@interface RCTUIGraphicsImageRendererFormat : NSObject
+
++ (instancetype)defaultFormat;
+
+@property (nonatomic) CGFloat scale;
+@property (nonatomic) BOOL opaque;
+
+@end
+
+@interface RCTUIGraphicsImageRenderer : NSObject
+
+- (instancetype)initWithSize:(CGSize)size format:(RCTUIGraphicsImageRendererFormat *)format;
+- (NSImage *)imageWithActions:(NS_NOESCAPE RCTUIGraphicsImageDrawingActions)actions;
+
+@end
+NS_ASSUME_NONNULL_END
+#endif