Skip to content

[Fabric] Fix bad merge that removed RCTUISwitch definition from #1576 #1585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

shwanton
Copy link

@shwanton shwanton commented Dec 12, 2022

Please select one of the following

  • I am removing an existing difference between facebook/react-native and microsoft/react-native-macos 👍
  • I am cherry-picking a change from Facebook's react-native into microsoft/react-native-macos 👍
  • I am making a fix / change for the macOS implementation of react-native
  • I am making a change required for Microsoft usage of react-native

Summary

#1576 overwrote a change from #1527 in RCTUIKit.h
building from main was broken after it was merged.

Changelog

[macOS] [Fabric] - Fix bad merge that removed RCTUISwitch definition

Test Plan

[x] Build RNTester - iOS w/ Fabric
CleanShot 2022-12-12 at 15 20 23

[x] Build RNTester-macOS w/ Paper - should work
CleanShot 2022-12-12 at 15 26 42

[x] Build RNTester - iOS w/ Paper - should work
CleanShot 2022-12-12 at 15 30 53

@shwanton shwanton marked this pull request as ready for review December 12, 2022 23:33
@shwanton shwanton requested a review from a team as a code owner December 12, 2022 23:33
@Saadnajmi Saadnajmi self-assigned this Dec 12, 2022
@Saadnajmi Saadnajmi enabled auto-merge (squash) December 13, 2022 00:11
@Saadnajmi Saadnajmi merged commit 73347c1 into microsoft:main Dec 13, 2022
@shwanton shwanton deleted the fabric/fix-bad-commit-RCTUISwitch branch December 13, 2022 00:45
shwanton added a commit to shwanton/react-native-macos that referenced this pull request Feb 13, 2023
Co-authored-by: Shawn Dempsey <shawndempsey@fb.com>
shwanton added a commit to shwanton/react-native-macos that referenced this pull request Mar 10, 2023
Co-authored-by: Shawn Dempsey <shawndempsey@fb.com>
shwanton added a commit to shwanton/react-native-macos that referenced this pull request Mar 10, 2023
Co-authored-by: Shawn Dempsey <shawndempsey@fb.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants