Merge branch 'main' into 0.72-merge-monorepo

Author: Adam Gleitman

.ado/apple-integration.yml

@@ -74,6 +74,17 @@ jobs:
           cat package.json | jq .devDependencies
         displayName: Modify example app dependencies
         workingDirectory: react-native-test-app/example
+      - template: templates/verdaccio-init.yml
+      - bash: |
+          npx beachball publish --branch origin/$(System.PullRequest.TargetBranch) --no-push --registry http://localhost:4873 --yes --access public
+        displayName: Publish beachball packages to verdaccio
+      - bash: |
+          cat .yarnrc.yml | sed 's_^npmRegistryServer: ".*"$_npmRegistryServer: "http://localhost:4873"_' > .yarnrc.yml.copy
+          rm .yarnrc.yml
+          mv .yarnrc.yml.copy .yarnrc.yml
+          echo -e '\nunsafeHttpWhitelist: ["localhost"]' >> .yarnrc.yml
+        displayName: Point react-native-test-app registry to verdaccio server
+        workingDirectory: react-native-test-app
       - bash: |
           yarn --no-immutable
         displayName: Install npm dependencies

.ado/templates/react-native-macos-init.yml

@@ -31,36 +31,14 @@ steps:
         cd packages/react-native-macos-init
         yarn build
 
-  - task: CmdLine@2
-    displayName: Launch test npm server (verdaccio)
-    inputs:
-      script: |
-        npx verdaccio --config ./.ado/verdaccio/config.yaml &
-
-  - script: |
-      npm set registry http://localhost:4873
-    displayName: Modify default npm config to point to local verdaccio server
-
-  - script: |
-      node .ado/waitForVerdaccio.js
-    displayName: Wait for verdaccio server to boot
-
-  - script: |
-      node .ado/npmAddUser.js user pass [email protected] http://localhost:4873
-    displayName: Add npm user to verdaccio
+  - template: verdaccio-init.yml
 
   - task: CmdLine@2
     displayName: Set package version
     inputs:
       script: node scripts/set-rn-version.js -b dry-run -v 1000.0.0
 
-  - script: |
-      npm publish --registry http://localhost:4873
-    displayName: Publish react-native-macos to verdaccio
-
-  - script: |
-      npx beachball publish --branch origin/$(System.PullRequest.TargetBranch) --no-push --registry http://localhost:4873 --yes --access public
-    displayName: Publish react-native-macos-init to verdaccio
+  - template: verdaccio-publish.yml
 
   - task: CmdLine@2
     displayName: Init new project

.ado/templates/verdaccio-init.yml

@@ -0,0 +1,20 @@
+# Initializes a verdaccio server.
+
+steps:
+  - task: CmdLine@2
+    displayName: Launch test npm server (verdaccio)
+    inputs:
+      script: |
+        npx verdaccio --config ./.ado/verdaccio/config.yaml &
+
+  - script: |
+      npm set registry http://localhost:4873
+    displayName: Modify default npm config to point to local verdaccio server
+
+  - script: |
+      node .ado/waitForVerdaccio.js
+    displayName: Wait for verdaccio server to boot
+
+  - script: |
+      node .ado/npmAddUser.js user pass [email protected] http://localhost:4873
+    displayName: Add npm user to verdaccio

.ado/templates/verdaccio-publish.yml

@@ -0,0 +1,10 @@
+# Publishes local packages to our verdaccio server.
+
+steps:
+  - script: |
+      npm publish --registry http://localhost:4873
+    displayName: Publish react-native-macos to verdaccio
+
+  - script: |
+      npx beachball publish --branch origin/$(System.PullRequest.TargetBranch) --no-push --registry http://localhost:4873 --yes --access public
+    displayName: Publish react-native-macos-init to verdaccio

packages/react-native/React/Base/RCTTouchHandler.m

@@ -229,11 +229,10 @@ - (void)_updateReactTouchAtIndex:(NSInteger)touchIndex
   NSEvent *nativeTouch = _nativeTouches[touchIndex];
   CGPoint location = nativeTouch.locationInWindow;
   RCTAssert(_cachedRootView, @"We were unable to find a root view for the touch");
-  CGPoint rootViewLocation = [_cachedRootView.window.contentView convertPoint:location toView:_cachedRootView];
+  CGPoint rootViewLocation = [_cachedRootView convertPoint:location fromView:nil];
+
   NSView *touchView = _touchViews[touchIndex];
   CGPoint touchViewLocation = [touchView convertPoint:location fromView:nil];
-  // JavaScript expects coordinates to have (0,0) at top left, unlike the macOS coordinate system
-  rootViewLocation.y = NSHeight([[_cachedRootView window] frame]) - rootViewLocation.y; 
 #endif // macOS]
 
   NSMutableDictionary *reactTouch = _reactTouches[touchIndex];

packages/react-native/package.json

@@ -86,7 +86,7 @@
     "@react-native/gradle-plugin": "^0.72.5",
     "@react-native/js-polyfills": "^0.72.1",
     "@react-native/normalize-colors": "^0.72.0",
-    "@react-native-mac/virtualized-lists": "^0.0.1",
+    "@react-native-mac/virtualized-lists": "^0.1.0",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "base64-js": "^1.1.2",

yarn.lock

@@ -5070,9 +5070,9 @@ fast-levenshtein@^2.0.6:
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
 fast-xml-parser@^4.0.12:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.1.2.tgz#5a98c18238d28a57bbdfa9fe4cda01211fff8f4a"
-  integrity sha512-CDYeykkle1LiA/uqQyNwYpFbyF6Axec6YapmpUP+/RHWIoR1zKjocdvNaTsxCxZzQ6v9MLXaSYm9Qq0thv0DHg==
+  version "4.2.7"
+  resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.2.7.tgz#871f2ca299dc4334b29f8da3658c164e68395167"
+  integrity sha512-J8r6BriSLO1uj2miOk1NW0YVm8AGOOu3Si2HQp/cSmo6EA4m3fcwu2WKjJ4RK9wMLBtg69y1kS8baDiQBR41Ig==
   dependencies:
     strnum "^1.0.5"