{"payload":{"feedbackUrl":"https://github.com/orgs/community/discussions/53140","repo":{"id":140759707,"defaultBranch":"main","name":"react-native-macos","ownerLogin":"microsoft","currentUserCanPush":false,"isFork":true,"isEmpty":false,"createdAt":"2018-07-12T20:06:39.000Z","ownerAvatar":"https://avatars.githubusercontent.com/u/6154722?v=4","public":true,"private":false,"isOrgOwned":true},"refInfo":{"name":"","listCacheKey":"v0:1725062894.0","currentOid":""},"activityList":{"items":[{"before":"b86ac5239832d7d72e22cb84b1878ce2f73138fe","after":"db3f8e7f8758d823b2cbfb812e7a5c6d50e8ce7b","ref":"refs/heads/main","pushedAt":"2024-08-31T00:02:17.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"Saadnajmi","name":"Saad Najmi","path":"/Saadnajmi","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/6722175?s=80&v=4"},"commit":{"message":"Sync `react-native-macos-init` vesrion with NPM registry using beachball (#2187)","shortMessageHtmlLink":"Sync react-native-macos-init vesrion with NPM registry using beachb…"}},{"before":"b732623bb52295d791c0fb4b1277235cf6287b8d","after":"b86ac5239832d7d72e22cb84b1878ce2f73138fe","ref":"refs/heads/main","pushedAt":"2024-08-30T23:46:24.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"Saadnajmi","name":"Saad Najmi","path":"/Saadnajmi","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/6722175?s=80&v=4"},"commit":{"message":"fix: Properly import `npm-registry-fetch` in `react-native-macos-init` (#2186)\n\n* fix: Properly import `npm-registry-fetch` in `react-native-macos-init`\r\n\r\n* Change files","shortMessageHtmlLink":"fix: Properly import npm-registry-fetch in react-native-macos-init ("}},{"before":"6d757396cfb896ee07e2b8ab6a0192e90730012b","after":"b732623bb52295d791c0fb4b1277235cf6287b8d","ref":"refs/heads/main","pushedAt":"2024-08-30T21:38:17.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"Saadnajmi","name":"Saad Najmi","path":"/Saadnajmi","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/6722175?s=80&v=4"},"commit":{"message":"[react-native-macos-init] Push change files for a new version #2177","shortMessageHtmlLink":"[react-native-macos-init] Push change files for a new version #2177"}},{"before":"afd856c2feb780d59c6bed5e8ce44eda67c36725","after":null,"ref":"refs/heads/publish-temp-1725049265779","pushedAt":"2024-08-30T20:21:12.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"dannyvv","name":"Danny van Velzen","path":"/dannyvv","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/11037542?s=80&v=4"}},{"before":"6cf4f6e24fe2e7dc6a40d183fa0a0958099984db","after":"afd856c2feb780d59c6bed5e8ce44eda67c36725","ref":"refs/heads/0.75-stable","pushedAt":"2024-08-30T20:21:11.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"dannyvv","name":"Danny van Velzen","path":"/dannyvv","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/11037542?s=80&v=4"},"commit":{"message":"Applying package update to 0.75.2 ***NO_CI***","shortMessageHtmlLink":"Applying package update to 0.75.2 ***NO_CI***"}},{"before":null,"after":"afd856c2feb780d59c6bed5e8ce44eda67c36725","ref":"refs/heads/publish-temp-1725049265779","pushedAt":"2024-08-30T20:21:07.000Z","pushType":"branch_creation","commitsCount":0,"pusher":{"login":"dannyvv","name":"Danny van Velzen","path":"/dannyvv","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/11037542?s=80&v=4"},"commit":{"message":"Applying package update to 0.75.2 ***NO_CI***","shortMessageHtmlLink":"Applying package update to 0.75.2 ***NO_CI***"}},{"before":"0d299e6f52d8cfa38b8c306fafa30c9d8ba1c48d","after":"6cf4f6e24fe2e7dc6a40d183fa0a0958099984db","ref":"refs/heads/0.75-stable","pushedAt":"2024-08-30T20:17:38.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"Saadnajmi","name":"Saad Najmi","path":"/Saadnajmi","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/6722175?s=80&v=4"},"commit":{"message":"fix: `local-cli` is missing from published package (#2182) (#2185)\n\nCo-authored-by: Tommy Nguyen <4123478+tido64@users.noreply.github.com>","shortMessageHtmlLink":"fix: local-cli is missing from published package (#2182) (#2185)"}},{"before":null,"after":"8f331f4fd2aa19ee77703a4d30c11d4fa31e0178","ref":"refs/heads/dependabot/npm_and_yarn/micromatch-4.0.8","pushedAt":"2024-08-30T19:22:32.000Z","pushType":"branch_creation","commitsCount":0,"pusher":{"login":"dependabot[bot]","name":null,"path":"/apps/dependabot","primaryAvatarUrl":"https://avatars.githubusercontent.com/in/29110?s=80&v=4"},"commit":{"message":"Bump micromatch from 4.0.5 to 4.0.8\n\nBumps [micromatch](https://github.com/micromatch/micromatch) from 4.0.5 to 4.0.8.\n- [Release notes](https://github.com/micromatch/micromatch/releases)\n- [Changelog](https://github.com/micromatch/micromatch/blob/master/CHANGELOG.md)\n- [Commits](https://github.com/micromatch/micromatch/compare/4.0.5...4.0.8)\n\n---\nupdated-dependencies:\n- dependency-name: micromatch\n dependency-type: direct:development\n...\n\nSigned-off-by: dependabot[bot] ","shortMessageHtmlLink":"Bump micromatch from 4.0.5 to 4.0.8"}},{"before":"bcc78e37ccb3f459bcf6e4e8d3ae5bd33a362f3e","after":null,"ref":"refs/heads/tido/include-local-cli","pushedAt":"2024-08-30T19:21:52.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"Saadnajmi","name":"Saad Najmi","path":"/Saadnajmi","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/6722175?s=80&v=4"}},{"before":"aa9817a205e003ec3bc993bbeeb2384dcaa9eb8a","after":"6d757396cfb896ee07e2b8ab6a0192e90730012b","ref":"refs/heads/main","pushedAt":"2024-08-30T19:21:46.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"Saadnajmi","name":"Saad Najmi","path":"/Saadnajmi","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/6722175?s=80&v=4"},"commit":{"message":"fix: `local-cli` is missing from published package (#2182)","shortMessageHtmlLink":"fix: local-cli is missing from published package (#2182)"}},{"before":null,"after":"bcc78e37ccb3f459bcf6e4e8d3ae5bd33a362f3e","ref":"refs/heads/tido/include-local-cli","pushedAt":"2024-08-30T09:56:06.000Z","pushType":"branch_creation","commitsCount":0,"pusher":{"login":"tido64","name":"Tommy Nguyen","path":"/tido64","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/4123478?s=80&v=4"},"commit":{"message":"fix: `local-cli` is missing from published package","shortMessageHtmlLink":"fix: local-cli is missing from published package"}},{"before":"3d5ba58667d51c59770fa5a7d30075caddf0d306","after":"aa9817a205e003ec3bc993bbeeb2384dcaa9eb8a","ref":"refs/heads/main","pushedAt":"2024-08-30T06:50:25.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"Saadnajmi","name":"Saad Najmi","path":"/Saadnajmi","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/6722175?s=80&v=4"},"commit":{"message":"fix: Port publish pipeline changes from 0.74 and 0.75 stable branches (#2180)","shortMessageHtmlLink":"fix: Port publish pipeline changes from 0.74 and 0.75 stable branches (…"}},{"before":"0d299e6f52d8cfa38b8c306fafa30c9d8ba1c48d","after":null,"ref":"refs/heads/publish-temp-1725000173299","pushedAt":"2024-08-30T06:42:59.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"dannyvv","name":"Danny van Velzen","path":"/dannyvv","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/11037542?s=80&v=4"}},{"before":"b5886c10397a75fa5e2d000678d77a3a1648ab01","after":"0d299e6f52d8cfa38b8c306fafa30c9d8ba1c48d","ref":"refs/heads/0.75-stable","pushedAt":"2024-08-30T06:42:58.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"dannyvv","name":"Danny van Velzen","path":"/dannyvv","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/11037542?s=80&v=4"},"commit":{"message":"Applying package update to 0.75.1 ***NO_CI***","shortMessageHtmlLink":"Applying package update to 0.75.1 ***NO_CI***"}},{"before":null,"after":"0d299e6f52d8cfa38b8c306fafa30c9d8ba1c48d","ref":"refs/heads/publish-temp-1725000173299","pushedAt":"2024-08-30T06:42:55.000Z","pushType":"branch_creation","commitsCount":0,"pusher":{"login":"dannyvv","name":"Danny van Velzen","path":"/dannyvv","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/11037542?s=80&v=4"},"commit":{"message":"Applying package update to 0.75.1 ***NO_CI***","shortMessageHtmlLink":"Applying package update to 0.75.1 ***NO_CI***"}},{"before":"3a50dbddcc2fbedf78da8192f03e2f3269daf010","after":"b5886c10397a75fa5e2d000678d77a3a1648ab01","ref":"refs/heads/0.75-stable","pushedAt":"2024-08-30T06:38:30.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"Saadnajmi","name":"Saad Najmi","path":"/Saadnajmi","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/6722175?s=80&v=4"},"commit":{"message":"[0.75] Publish React Native macOS 0.75.0 (Take 2) (#2181)","shortMessageHtmlLink":"[0.75] Publish React Native macOS 0.75.0 (Take 2) (#2181)"}},{"before":"2f2ad4725ce46dd0d9454bf43ea04f4facf73fb9","after":"3a50dbddcc2fbedf78da8192f03e2f3269daf010","ref":"refs/heads/0.75-stable","pushedAt":"2024-08-29T21:41:10.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"Saadnajmi","name":"Saad Najmi","path":"/Saadnajmi","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/6722175?s=80&v=4"},"commit":{"message":"[0.75] Publish React Native macOS 0.75.0 (#2178)\n\n* [0.75] Publish 0.75.0\r\n\r\n* Update virtualized-lists dependency","shortMessageHtmlLink":"[0.75] Publish React Native macOS 0.75.0 (#2178)"}},{"before":"429b1b02df4d476d936cf6549b354c678a0592d7","after":"2f2ad4725ce46dd0d9454bf43ea04f4facf73fb9","ref":"refs/heads/0.75-stable","pushedAt":"2024-08-29T15:10:53.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"dannyvv","name":"Danny van Velzen","path":"/dannyvv","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/11037542?s=80&v=4"},"commit":{"message":"applying package updates ***NO_CI***","shortMessageHtmlLink":"applying package updates ***NO_CI***"}},{"before":"103bc54b65b791e28e858a2d7bba62b0c61f1c78","after":"429b1b02df4d476d936cf6549b354c678a0592d7","ref":"refs/heads/0.75-stable","pushedAt":"2024-08-29T15:04:39.000Z","pushType":"pr_merge","commitsCount":2,"pusher":{"login":"Saadnajmi","name":"Saad Najmi","path":"/Saadnajmi","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/6722175?s=80&v=4"},"commit":{"message":"[0.75] Let beachball publish run on stable branches (#2179)\n\nI missed a line to remove a check to let beachball publish run on stable\r\nbranches. We previously did the same change in `0.74-stable` with\r\nhttps://github.com/microsoft/react-native-macos/pull/2158","shortMessageHtmlLink":"[0.75] Let beachball publish run on stable branches (#2179)"}},{"before":"3d5ba58667d51c59770fa5a7d30075caddf0d306","after":"103bc54b65b791e28e858a2d7bba62b0c61f1c78","ref":"refs/heads/0.75-stable","pushedAt":"2024-08-29T14:05:31.000Z","pushType":"pr_merge","commitsCount":139,"pusher":{"login":"Saadnajmi","name":"Saad Najmi","path":"/Saadnajmi","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/6722175?s=80&v=4"},"commit":{"message":"[0.75] Merge up to 0.75.2 (#2169)\n\n## Summary:\r\n\r\nMerge up to React Native 0.75.2\r\n\r\n## Test Plan:\r\n\r\nCI should pass.","shortMessageHtmlLink":"[0.75] Merge up to 0.75.2 (#2169)"}},{"before":null,"after":"a0d230ca19ed184e6635e39b3476802d84572570","ref":"refs/heads/dependabot/bundler/packages/helloworld/rexml-3.3.6","pushedAt":"2024-08-23T06:35:43.000Z","pushType":"branch_creation","commitsCount":0,"pusher":{"login":"dependabot[bot]","name":null,"path":"/apps/dependabot","primaryAvatarUrl":"https://avatars.githubusercontent.com/in/29110?s=80&v=4"},"commit":{"message":"Bump rexml from 3.2.6 to 3.3.6 in /packages/helloworld\n\nBumps [rexml](https://github.com/ruby/rexml) from 3.2.6 to 3.3.6.\n- [Release notes](https://github.com/ruby/rexml/releases)\n- [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md)\n- [Commits](https://github.com/ruby/rexml/compare/v3.2.6...v3.3.6)\n\n---\nupdated-dependencies:\n- dependency-name: rexml\n dependency-type: indirect\n...\n\nSigned-off-by: dependabot[bot] ","shortMessageHtmlLink":"Bump rexml from 3.2.6 to 3.3.6 in /packages/helloworld"}},{"before":null,"after":"3d5ba58667d51c59770fa5a7d30075caddf0d306","ref":"refs/heads/0.75-stable","pushedAt":"2024-08-23T06:35:20.000Z","pushType":"branch_creation","commitsCount":0,"pusher":{"login":"Saadnajmi","name":"Saad Najmi","path":"/Saadnajmi","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/6722175?s=80&v=4"},"commit":{"message":"Merge up to 0.75 branch cut (#2157)\n\nMerge up to\r\nhttps://github.com/facebook/react-native/commit/6f7eae5c583090bd62ca60a4c3170445e5a0a751\r\n, the commit for the `0.75-stable` branch cut.\r\n\r\n## Summary:\r\n\r\n### Interesting upstream changes:
\r\n- Some commit removed `packages/react-native/local-cli`, as React Native\r\nis reducing its dependency on `@react-native-community/cli`.\r\n- We will keep this directory around so we can continue shipping our\r\n`run-macos` command.\r\n-\r\nhttps://github.com/facebook/react-native/commit/775713cef7ff7b45a60c34e4f1629dc6cde1aa05\r\nUpstream commit that replicates a diff we’ve had in RNM for a while to\r\nhave `focusable` consistent with `disabled`. I also modified our macOS\r\nprop `acceptsFirstMouse` to match.\r\n-\r\nhttps://github.com/facebook/react-native/commit/a1b318c18bc3a576c77d477de0b26af571fbdd31\r\n`TouchableWithoutFeedback` was rewritten as a Function component using\r\nPressability. We needed to update our implementation to match.\r\n-\r\nhttps://github.com/facebook/react-native/commit/a40bd8e34a4de61e9f7690f808fe978fab1df11c\r\nAdds DisplayP3 Colorspace support. This mostly worked with NSColor,\r\nminus a one line diff in `HostPlatformColor.mm` where we have to handle\r\nan assert.\r\n- I also opened https://github.com/facebook/react-native/pull/46071/ to\r\nfix a nit on the implementation.\r\n-\r\nhttps://github.com/facebook/react-native/commit/a977b2e69b73e9de735f3bbaa2440ac1dea17148\r\nPorted DevSettingsModule.java to Kotlin, we needadd back our one method\r\n`setIsSecondaryClickToShowDevMenuEnabled`\r\n-\r\nhttps://github.com/facebook/react-native/commit/252ef19c8d5bc5392d900af21136b351723f3b3c\r\nencouraged me to update some uses of `RCTUIView` to `RCTPlatformView`\r\ninside RCTScrollView.\r\n-\r\nhttps://github.com/facebook/react-native/commit/eadcebbb3efe1af70f3f7321617df9bc7fde0371\r\nAdds support for Text highlighting in Fabric\r\n-\r\nhttps://github.com/facebook/react-native/commit/95a8c99f3fe72550c4b08be0718a6722a605db52\r\nencouraged me to undo a couple of ifdefs:\r\n- `RCTSendScrollEventForNativeAnimations_DEPRECATED` is now implemented\r\nfor macOS\r\n- We had a couple of ifdefs in RCTScrollView to use `self.contentView`\r\ninstead of `_contentView`. I undid these. We should make sure these are\r\nproper, and if so, upstream the change.\r\n-\r\nhttps://github.com/facebook/react-native/commit/8597727c28d9cb77012f3f4ebb032c335246d589\r\nNeeded some diffs that need an `@availability` check for macOS 11…\r\n-\r\nhttps://github.com/facebook/react-native/commit/f6badca2f9a5f1e986dd76444bebde0d6049513d\r\nwas kept in for macOS as well.\r\n- RCTSegmentedControl was removed from React Native Core.\r\n - Followup: Upstream our macOS implementation.\r\n\r\n
### Other interesting changes:
\r\n- Disabled the RNTester Integration test WebsocketTest for macOS. This\r\npassed locally for me, so I’m not sure why it’s failing in CI.\r\n - Followup: Add a task to re-enable this test. \r\n- Ifdeffed out most references of `InputAccessoryView` to only iOS. This\r\nisn’t relevant for macOS or visionOS.\r\n- Removed diffs in `RCTImageLoader` introduced way back with\r\nhttps://github.com/microsoft/react-native-macos/commit/4b19d14ebabc95f11e5d8213d3a68b3c05b57989\r\n. They don’t seem to be necessary anymore\r\n- We ifdefed out the implementation for\r\n`RCTPausedInDebuggerOverlayController`. This is used by the experimental\r\nnew debugger with Hermes.\r\n- Followup: Implement this for macOS at a future time. For bonus points,\r\nrewrite it in SwiftUI.\r\n\r\n### Other notes
There’s an increasing amount of places where upstream\r\ncode calls `UIView.backgroundColor = <>`. This is one of those things\r\nthat doesn’t entirely work properly without `RCTUIView`, but in most\r\nplaces, I use `RCTPlatformView` (aka `NSView`) and shim it as\r\nfollows:
```
#if !TARGET_OS_OSX // [macOS]\r\n view.backgroundColor = [UIColor systemBackgroundColor];\r\n#else // [macOS\r\n view.wantsLayer = true;\r\nview.layer.backgroundColor = [[NSColor windowBackgroundColor] CGColor];\r\n#endif // macOS]\r\n```
This mostly works.. except for Light/Dark mode, because the background color won’t update. To properly implement `backgroundColor`, we need to override `displayLayer`. `RCTUIView` already does this, so perhaps the followup is to update most uses to use RCTUIView. Also, maybe `RCTUIKit` should be a separate pod altogether?\r\n\r\n## Test Plan:\r\n\r\nCi should pass.\r\n\r\n## List of merge conflicts\r\n```\r\nUnmerged paths:\r\n (use \"git add/rm ...\" as appropriate to mark resolution)\r\n both modified: jest.config.js\r\n both modified: package.json\r\n added by us: packages/helloworld/generate-macos.js\r\n added by us: packages/helloworld/generator-common/index.js\r\n added by us: packages/helloworld/generator-macos/index.js\r\nadded by us:\r\npackages/helloworld/generator-macos/templates/macos/HelloWorld-macOS/AppDelegate.h\r\nadded by us:\r\npackages/helloworld/generator-macos/templates/macos/HelloWorld-macOS/AppDelegate.mm\r\nadded by us:\r\npackages/helloworld/generator-macos/templates/macos/HelloWorld-macOS/Assets.xcassets/AppIcon.appiconset/Contents.json\r\nadded by us:\r\npackages/helloworld/generator-macos/templates/macos/HelloWorld-macOS/Assets.xcassets/Contents.json\r\nadded by us:\r\npackages/helloworld/generator-macos/templates/macos/HelloWorld-macOS/Base.lproj/Main.storyboard\r\nadded by us:\r\npackages/helloworld/generator-macos/templates/macos/HelloWorld-macOS/HelloWorld.entitlements\r\nadded by us:\r\npackages/helloworld/generator-macos/templates/macos/HelloWorld-macOS/Info.plist\r\nadded by us:\r\npackages/helloworld/generator-macos/templates/macos/HelloWorld-macOS/main.m\r\nadded by us:\r\npackages/helloworld/generator-macos/templates/macos/HelloWorld.xcodeproj/project.pbxproj\r\nadded by us:\r\npackages/helloworld/generator-macos/templates/macos/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld-iOS.xcscheme\r\nadded by us:\r\npackages/helloworld/generator-macos/templates/macos/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld-macOS.xcscheme\r\nadded by us: packages/helloworld/generator-macos/templates/macos/Podfile\r\nadded by us:\r\npackages/helloworld/generator-macos/templates/macos/_gitignore\r\nadded by us: packages/helloworld/runMacOS/findXcodeProject.js\r\n added by us: packages/helloworld/runMacOS/runMacOS.js\r\nboth modified: packages/react-native-test-renderer/package.json\r\nboth modified:\r\npackages/react-native/Libraries/AppDelegate/RCTAppDelegate.h\r\nboth modified:\r\npackages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm\r\nboth modified: packages/react-native/Libraries/Components/Button.js\r\nboth modified:\r\npackages/react-native/Libraries/Components/ScrollView/ScrollView.js\r\nboth modified:\r\npackages/react-native/Libraries/Components/TextInput/RCTTextInputViewConfig.js\r\nboth modified:\r\npackages/react-native/Libraries/Components/TextInput/TextInput.js\r\nboth modified:\r\npackages/react-native/Libraries/Components/Touchable/TouchableHighlight.js\r\nboth modified:\r\npackages/react-native/Libraries/Components/Touchable/TouchableOpacity.js\r\nboth modified:\r\npackages/react-native/Libraries/Components/Touchable/TouchableWithoutFeedback.js\r\nboth modified:\r\npackages/react-native/Libraries/Components/View/ReactNativeStyleAttributes.js\r\nboth modified:\r\npackages/react-native/Libraries/Image/RCTUIImageViewAnimated.mm\r\nboth modified:\r\npackages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.h\r\nboth modified:\r\npackages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm\r\nboth modified:\r\npackages/react-native/Libraries/StyleSheet/StyleSheetTypes.d.ts\r\nboth modified:\r\npackages/react-native/Libraries/StyleSheet/StyleSheetTypes.js\r\nboth modified:\r\npackages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm\r\nboth modified:\r\npackages/react-native/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h\r\nboth modified:\r\npackages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm\r\nboth modified:\r\npackages/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.mm\r\nboth modified:\r\npackages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewContent.mm\r\nboth modified: packages/react-native/Libraries/Text/TextProps.js\r\nboth modified:\r\npackages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap\r\n both modified: packages/react-native/React/Base/RCTConvert.h\r\n both modified: packages/react-native/React/Base/RCTConvert.mm\r\nboth modified:\r\npackages/react-native/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm\r\nboth modified: packages/react-native/React/CoreModules/RCTDevSettings.mm\r\nboth modified: packages/react-native/React/CoreModules/RCTDeviceInfo.mm\r\nboth modified: packages/react-native/React/CoreModules/RCTRedBox.mm\r\nboth modified:\r\npackages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.mm\r\nboth modified:\r\npackages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm\r\nboth modified:\r\npackages/react-native/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm\r\nboth modified:\r\npackages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm\r\nboth modified: packages/react-native/React/Modules/RCTUIManager.m\r\n both added: packages/react-native/React/Views/RCTCursor.h\r\nboth modified:\r\npackages/react-native/React/Views/RCTModalHostViewManager.h\r\ndeleted by them: packages/react-native/React/Views/RCTSegmentedControl.h\r\ndeleted by them: packages/react-native/React/Views/RCTSegmentedControl.m\r\ndeleted by them:\r\npackages/react-native/React/Views/RCTSegmentedControlManager.m\r\n both modified: packages/react-native/React/Views/RCTView.h\r\n both modified: packages/react-native/React/Views/RCTView.m\r\nboth modified: packages/react-native/React/Views/RCTViewManager.m\r\nboth modified:\r\npackages/react-native/React/Views/ScrollView/RCTScrollView.m\r\ndeleted by them:\r\npackages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevSettingsModule.java\r\nboth modified:\r\npackages/react-native/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/RCTSampleTurboModule.mm\r\nboth modified:\r\npackages/react-native/ReactCommon/react/renderer/components/view/BaseViewProps.cpp\r\nboth modified:\r\npackages/react-native/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp\r\nboth modified:\r\npackages/react-native/ReactCommon/react/renderer/components/view/primitives.h\r\nboth modified:\r\npackages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/HostPlatformColor.mm\r\n both modified: packages/react-native/package.json\r\n both modified: packages/react-native/react-native.config.js\r\n both modified: packages/react-native/template/package.json\r\n both modified: packages/rn-tester/Podfile.lock\r\nboth modified: packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj\r\nboth modified:\r\npackages/rn-tester/js/examples/Accessibility/AccessibilityExample.js\r\nboth added: packages/rn-tester/js/examples/Cursor/CursorExample.js\r\nboth modified:\r\npackages/rn-tester/js/examples/PlatformColor/PlatformColorExample.js\r\nboth modified: packages/rn-tester/js/examples/Text/TextExample.ios.js\r\nboth modified:\r\npackages/rn-tester/js/examples/TextInput/TextInputExample.ios.js\r\n both modified: packages/rn-tester/package.json\r\n both modified: packages/virtualized-lists/package.json\r\ndeleted by them: scripts/releases-ci/prepare-package-for-release.js\r\n both modified: scripts/releases-ci/publish-npm.js\r\n both modified: yarn.lock\r\n```","shortMessageHtmlLink":"Merge up to 0.75 branch cut (#2157)"}},{"before":"7361b165ef633d3d95dbdb69da58ff6119f07369","after":"3d5ba58667d51c59770fa5a7d30075caddf0d306","ref":"refs/heads/main","pushedAt":"2024-08-23T06:35:02.000Z","pushType":"pr_merge","commitsCount":1379,"pusher":{"login":"Saadnajmi","name":"Saad Najmi","path":"/Saadnajmi","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/6722175?s=80&v=4"},"commit":{"message":"Merge up to 0.75 branch cut (#2157)\n\nMerge up to\r\nhttps://github.com/facebook/react-native/commit/6f7eae5c583090bd62ca60a4c3170445e5a0a751\r\n, the commit for the `0.75-stable` branch cut.\r\n\r\n## Summary:\r\n\r\n### Interesting upstream changes:
\r\n- Some commit removed `packages/react-native/local-cli`, as React Native\r\nis reducing its dependency on `@react-native-community/cli`.\r\n- We will keep this directory around so we can continue shipping our\r\n`run-macos` command.\r\n-\r\nhttps://github.com/facebook/react-native/commit/775713cef7ff7b45a60c34e4f1629dc6cde1aa05\r\nUpstream commit that replicates a diff we’ve had in RNM for a while to\r\nhave `focusable` consistent with `disabled`. I also modified our macOS\r\nprop `acceptsFirstMouse` to match.\r\n-\r\nhttps://github.com/facebook/react-native/commit/a1b318c18bc3a576c77d477de0b26af571fbdd31\r\n`TouchableWithoutFeedback` was rewritten as a Function component using\r\nPressability. We needed to update our implementation to match.\r\n-\r\nhttps://github.com/facebook/react-native/commit/a40bd8e34a4de61e9f7690f808fe978fab1df11c\r\nAdds DisplayP3 Colorspace support. This mostly worked with NSColor,\r\nminus a one line diff in `HostPlatformColor.mm` where we have to handle\r\nan assert.\r\n- I also opened https://github.com/facebook/react-native/pull/46071/ to\r\nfix a nit on the implementation.\r\n-\r\nhttps://github.com/facebook/react-native/commit/a977b2e69b73e9de735f3bbaa2440ac1dea17148\r\nPorted DevSettingsModule.java to Kotlin, we needadd back our one method\r\n`setIsSecondaryClickToShowDevMenuEnabled`\r\n-\r\nhttps://github.com/facebook/react-native/commit/252ef19c8d5bc5392d900af21136b351723f3b3c\r\nencouraged me to update some uses of `RCTUIView` to `RCTPlatformView`\r\ninside RCTScrollView.\r\n-\r\nhttps://github.com/facebook/react-native/commit/eadcebbb3efe1af70f3f7321617df9bc7fde0371\r\nAdds support for Text highlighting in Fabric\r\n-\r\nhttps://github.com/facebook/react-native/commit/95a8c99f3fe72550c4b08be0718a6722a605db52\r\nencouraged me to undo a couple of ifdefs:\r\n- `RCTSendScrollEventForNativeAnimations_DEPRECATED` is now implemented\r\nfor macOS\r\n- We had a couple of ifdefs in RCTScrollView to use `self.contentView`\r\ninstead of `_contentView`. I undid these. We should make sure these are\r\nproper, and if so, upstream the change.\r\n-\r\nhttps://github.com/facebook/react-native/commit/8597727c28d9cb77012f3f4ebb032c335246d589\r\nNeeded some diffs that need an `@availability` check for macOS 11…\r\n-\r\nhttps://github.com/facebook/react-native/commit/f6badca2f9a5f1e986dd76444bebde0d6049513d\r\nwas kept in for macOS as well.\r\n- RCTSegmentedControl was removed from React Native Core.\r\n - Followup: Upstream our macOS implementation.\r\n\r\n
### Other interesting changes:
\r\n- Disabled the RNTester Integration test WebsocketTest for macOS. This\r\npassed locally for me, so I’m not sure why it’s failing in CI.\r\n - Followup: Add a task to re-enable this test. \r\n- Ifdeffed out most references of `InputAccessoryView` to only iOS. This\r\nisn’t relevant for macOS or visionOS.\r\n- Removed diffs in `RCTImageLoader` introduced way back with\r\nhttps://github.com/microsoft/react-native-macos/commit/4b19d14ebabc95f11e5d8213d3a68b3c05b57989\r\n. They don’t seem to be necessary anymore\r\n- We ifdefed out the implementation for\r\n`RCTPausedInDebuggerOverlayController`. This is used by the experimental\r\nnew debugger with Hermes.\r\n- Followup: Implement this for macOS at a future time. For bonus points,\r\nrewrite it in SwiftUI.\r\n\r\n### Other notes
There’s an increasing amount of places where upstream\r\ncode calls `UIView.backgroundColor = <>`. This is one of those things\r\nthat doesn’t entirely work properly without `RCTUIView`, but in most\r\nplaces, I use `RCTPlatformView` (aka `NSView`) and shim it as\r\nfollows:
```
#if !TARGET_OS_OSX // [macOS]\r\n view.backgroundColor = [UIColor systemBackgroundColor];\r\n#else // [macOS\r\n view.wantsLayer = true;\r\nview.layer.backgroundColor = [[NSColor windowBackgroundColor] CGColor];\r\n#endif // macOS]\r\n```
This mostly works.. except for Light/Dark mode, because the background color won’t update. To properly implement `backgroundColor`, we need to override `displayLayer`. `RCTUIView` already does this, so perhaps the followup is to update most uses to use RCTUIView. Also, maybe `RCTUIKit` should be a separate pod altogether?\r\n\r\n## Test Plan:\r\n\r\nCi should pass.\r\n\r\n## List of merge conflicts\r\n```\r\nUnmerged paths:\r\n (use \"git add/rm ...\" as appropriate to mark resolution)\r\n both modified: jest.config.js\r\n both modified: package.json\r\n added by us: packages/helloworld/generate-macos.js\r\n added by us: packages/helloworld/generator-common/index.js\r\n added by us: packages/helloworld/generator-macos/index.js\r\nadded by us:\r\npackages/helloworld/generator-macos/templates/macos/HelloWorld-macOS/AppDelegate.h\r\nadded by us:\r\npackages/helloworld/generator-macos/templates/macos/HelloWorld-macOS/AppDelegate.mm\r\nadded by us:\r\npackages/helloworld/generator-macos/templates/macos/HelloWorld-macOS/Assets.xcassets/AppIcon.appiconset/Contents.json\r\nadded by us:\r\npackages/helloworld/generator-macos/templates/macos/HelloWorld-macOS/Assets.xcassets/Contents.json\r\nadded by us:\r\npackages/helloworld/generator-macos/templates/macos/HelloWorld-macOS/Base.lproj/Main.storyboard\r\nadded by us:\r\npackages/helloworld/generator-macos/templates/macos/HelloWorld-macOS/HelloWorld.entitlements\r\nadded by us:\r\npackages/helloworld/generator-macos/templates/macos/HelloWorld-macOS/Info.plist\r\nadded by us:\r\npackages/helloworld/generator-macos/templates/macos/HelloWorld-macOS/main.m\r\nadded by us:\r\npackages/helloworld/generator-macos/templates/macos/HelloWorld.xcodeproj/project.pbxproj\r\nadded by us:\r\npackages/helloworld/generator-macos/templates/macos/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld-iOS.xcscheme\r\nadded by us:\r\npackages/helloworld/generator-macos/templates/macos/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld-macOS.xcscheme\r\nadded by us: packages/helloworld/generator-macos/templates/macos/Podfile\r\nadded by us:\r\npackages/helloworld/generator-macos/templates/macos/_gitignore\r\nadded by us: packages/helloworld/runMacOS/findXcodeProject.js\r\n added by us: packages/helloworld/runMacOS/runMacOS.js\r\nboth modified: packages/react-native-test-renderer/package.json\r\nboth modified:\r\npackages/react-native/Libraries/AppDelegate/RCTAppDelegate.h\r\nboth modified:\r\npackages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm\r\nboth modified: packages/react-native/Libraries/Components/Button.js\r\nboth modified:\r\npackages/react-native/Libraries/Components/ScrollView/ScrollView.js\r\nboth modified:\r\npackages/react-native/Libraries/Components/TextInput/RCTTextInputViewConfig.js\r\nboth modified:\r\npackages/react-native/Libraries/Components/TextInput/TextInput.js\r\nboth modified:\r\npackages/react-native/Libraries/Components/Touchable/TouchableHighlight.js\r\nboth modified:\r\npackages/react-native/Libraries/Components/Touchable/TouchableOpacity.js\r\nboth modified:\r\npackages/react-native/Libraries/Components/Touchable/TouchableWithoutFeedback.js\r\nboth modified:\r\npackages/react-native/Libraries/Components/View/ReactNativeStyleAttributes.js\r\nboth modified:\r\npackages/react-native/Libraries/Image/RCTUIImageViewAnimated.mm\r\nboth modified:\r\npackages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.h\r\nboth modified:\r\npackages/react-native/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm\r\nboth modified:\r\npackages/react-native/Libraries/StyleSheet/StyleSheetTypes.d.ts\r\nboth modified:\r\npackages/react-native/Libraries/StyleSheet/StyleSheetTypes.js\r\nboth modified:\r\npackages/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm\r\nboth modified:\r\npackages/react-native/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h\r\nboth modified:\r\npackages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm\r\nboth modified:\r\npackages/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.mm\r\nboth modified:\r\npackages/react-native/Libraries/Text/TextInput/RCTInputAccessoryViewContent.mm\r\nboth modified: packages/react-native/Libraries/Text/TextProps.js\r\nboth modified:\r\npackages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap\r\n both modified: packages/react-native/React/Base/RCTConvert.h\r\n both modified: packages/react-native/React/Base/RCTConvert.mm\r\nboth modified:\r\npackages/react-native/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm\r\nboth modified: packages/react-native/React/CoreModules/RCTDevSettings.mm\r\nboth modified: packages/react-native/React/CoreModules/RCTDeviceInfo.mm\r\nboth modified: packages/react-native/React/CoreModules/RCTRedBox.mm\r\nboth modified:\r\npackages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.mm\r\nboth modified:\r\npackages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm\r\nboth modified:\r\npackages/react-native/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm\r\nboth modified:\r\npackages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm\r\nboth modified: packages/react-native/React/Modules/RCTUIManager.m\r\n both added: packages/react-native/React/Views/RCTCursor.h\r\nboth modified:\r\npackages/react-native/React/Views/RCTModalHostViewManager.h\r\ndeleted by them: packages/react-native/React/Views/RCTSegmentedControl.h\r\ndeleted by them: packages/react-native/React/Views/RCTSegmentedControl.m\r\ndeleted by them:\r\npackages/react-native/React/Views/RCTSegmentedControlManager.m\r\n both modified: packages/react-native/React/Views/RCTView.h\r\n both modified: packages/react-native/React/Views/RCTView.m\r\nboth modified: packages/react-native/React/Views/RCTViewManager.m\r\nboth modified:\r\npackages/react-native/React/Views/ScrollView/RCTScrollView.m\r\ndeleted by them:\r\npackages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevSettingsModule.java\r\nboth modified:\r\npackages/react-native/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/RCTSampleTurboModule.mm\r\nboth modified:\r\npackages/react-native/ReactCommon/react/renderer/components/view/BaseViewProps.cpp\r\nboth modified:\r\npackages/react-native/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp\r\nboth modified:\r\npackages/react-native/ReactCommon/react/renderer/components/view/primitives.h\r\nboth modified:\r\npackages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/HostPlatformColor.mm\r\n both modified: packages/react-native/package.json\r\n both modified: packages/react-native/react-native.config.js\r\n both modified: packages/react-native/template/package.json\r\n both modified: packages/rn-tester/Podfile.lock\r\nboth modified: packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj\r\nboth modified:\r\npackages/rn-tester/js/examples/Accessibility/AccessibilityExample.js\r\nboth added: packages/rn-tester/js/examples/Cursor/CursorExample.js\r\nboth modified:\r\npackages/rn-tester/js/examples/PlatformColor/PlatformColorExample.js\r\nboth modified: packages/rn-tester/js/examples/Text/TextExample.ios.js\r\nboth modified:\r\npackages/rn-tester/js/examples/TextInput/TextInputExample.ios.js\r\n both modified: packages/rn-tester/package.json\r\n both modified: packages/virtualized-lists/package.json\r\ndeleted by them: scripts/releases-ci/prepare-package-for-release.js\r\n both modified: scripts/releases-ci/publish-npm.js\r\n both modified: yarn.lock\r\n```","shortMessageHtmlLink":"Merge up to 0.75 branch cut (#2157)"}},{"before":"6d4a0b145930a47b05229555af2b8f4e6c49a923","after":"7361b165ef633d3d95dbdb69da58ff6119f07369","ref":"refs/heads/main","pushedAt":"2024-08-23T01:34:00.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"Saadnajmi","name":"Saad Najmi","path":"/Saadnajmi","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/6722175?s=80&v=4"},"commit":{"message":"Bump minimum macOS requirement to 11.0 (#2170)\n\n* Bump macOS minimum OS requirement to 11.0\r\n\r\n* Update README.md\r\n\r\nCo-authored-by: Tommy Nguyen <4123478+tido64@users.noreply.github.com>\r\n\r\n* Update RCTUIKit.m\r\n\r\n---------\r\n\r\nCo-authored-by: Tommy Nguyen <4123478+tido64@users.noreply.github.com>","shortMessageHtmlLink":"Bump minimum macOS requirement to 11.0 (#2170)"}},{"before":"3cbb5f12366d93844e116fc1e32529863ac52074","after":null,"ref":"refs/heads/dependabot/npm_and_yarn/ws-6.2.3","pushedAt":"2024-08-23T00:30:30.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"dependabot[bot]","name":null,"path":"/apps/dependabot","primaryAvatarUrl":"https://avatars.githubusercontent.com/in/29110?s=80&v=4"}},{"before":"60614dc41f098d0c9a1501ff96ff2c071b856d10","after":"6d4a0b145930a47b05229555af2b8f4e6c49a923","ref":"refs/heads/main","pushedAt":"2024-08-23T00:30:23.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"Saadnajmi","name":"Saad Najmi","path":"/Saadnajmi","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/6722175?s=80&v=4"},"commit":{"message":"Bump ws from 6.2.2 to 6.2.3 (#2139)\n\nBumps [ws](https://github.com/websockets/ws) from 6.2.2 to 6.2.3.\r\n- [Release notes](https://github.com/websockets/ws/releases)\r\n- [Commits](https://github.com/websockets/ws/compare/6.2.2...6.2.3)\r\n\r\n---\r\nupdated-dependencies:\r\n- dependency-name: ws\r\n dependency-type: direct:production\r\n...\r\n\r\nSigned-off-by: dependabot[bot] \r\nCo-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>","shortMessageHtmlLink":"Bump ws from 6.2.2 to 6.2.3 (#2139)"}},{"before":"8e3477ca02f498b6d66d5acb729e547d678a7530","after":null,"ref":"refs/heads/publish-temp-1724372940541","pushedAt":"2024-08-23T00:29:06.000Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"dannyvv","name":"Danny van Velzen","path":"/dannyvv","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/11037542?s=80&v=4"}},{"before":"529cb7f5a040f79e17e036cbd0df31f6ada6a730","after":"8e3477ca02f498b6d66d5acb729e547d678a7530","ref":"refs/heads/0.74-stable","pushedAt":"2024-08-23T00:29:05.000Z","pushType":"push","commitsCount":1,"pusher":{"login":"dannyvv","name":"Danny van Velzen","path":"/dannyvv","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/11037542?s=80&v=4"},"commit":{"message":"Applying package update to 0.74.4 ***NO_CI***","shortMessageHtmlLink":"Applying package update to 0.74.4 ***NO_CI***"}},{"before":null,"after":"8e3477ca02f498b6d66d5acb729e547d678a7530","ref":"refs/heads/publish-temp-1724372940541","pushedAt":"2024-08-23T00:29:02.000Z","pushType":"branch_creation","commitsCount":0,"pusher":{"login":"dannyvv","name":"Danny van Velzen","path":"/dannyvv","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/11037542?s=80&v=4"},"commit":{"message":"Applying package update to 0.74.4 ***NO_CI***","shortMessageHtmlLink":"Applying package update to 0.74.4 ***NO_CI***"}},{"before":"1f82ed95839b62d220d7b5176f0b8a5671be39bd","after":"529cb7f5a040f79e17e036cbd0df31f6ada6a730","ref":"refs/heads/0.74-stable","pushedAt":"2024-08-23T00:24:10.000Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"Saadnajmi","name":"Saad Najmi","path":"/Saadnajmi","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/6722175?s=80&v=4"},"commit":{"message":"Introduce props `keyDownEvents` and `keyUpEvents` (#2172)","shortMessageHtmlLink":"Introduce props keyDownEvents and keyUpEvents (#2172)"}}],"hasNextPage":true,"hasPreviousPage":false,"activityType":"all","actor":null,"timePeriod":"all","sort":"DESC","perPage":30,"cursor":"djE6ks8AAAAEqR5nugA","startCursor":null,"endCursor":null}},"title":"Activity · microsoft/react-native-macos"}