Skip to content

[Fabric] Shim RCTUILabel #1576

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
merged 7 commits into from
Dec 10, 2022
Merged

Conversation

shwanton
Copy link

@shwanton shwanton commented Dec 8, 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

Fabric on macOS
Shim RCTUILabel to work w/ Fabric

closes #1540

NOTE Will revisit UI once everything is rendering on MacOS

Changelog

[macOS][Fabric] - Shim RCTUILabel for Fabric

Test Plan

[x] Build RNTester-macOS w/ Fabric - doesn’t run yet, but no RCTUnimplementedViewComponentView errors
CleanShot 2022-12-07 at 16 08 04

Build errors:
Build RNTester-macOS_2022-12-05T17-49-32.txt

[x] Build RNTester - iOS w/ Fabric - New architecture example should work
https://user-images.githubusercontent.com/96719/206325127-a12d82aa-55a3-4474-9c45-d6a50d496907.mp4

[x] Build RNTester-macOS w/ Paper - should work

CleanShot.2022-12-07.at.16.31.20.mp4

[x] Build RNTester - iOS w/ Paper - should work

CleanShot.2022-12-07.at.16.28.33.mp4

@shwanton shwanton marked this pull request as ready for review December 8, 2022 00:34
@shwanton shwanton requested a review from a team as a code owner December 8, 2022 00:34
@shwanton
Copy link
Author

closes #1540

@Saadnajmi Saadnajmi merged commit 16ea9bf into microsoft:main Dec 10, 2022
@shwanton shwanton deleted the fabric/shim-RCTUILabel branch December 12, 2022 22:34
shwanton pushed a commit to shwanton/react-native-macos that referenced this pull request Dec 12, 2022
Saadnajmi pushed a commit that referenced this pull request Dec 13, 2022
Co-authored-by: Shawn Dempsey <shawndempsey@fb.com>
Saadnajmi pushed a commit that referenced this pull request Dec 22, 2022
* Fix RCTUISwitch definition removed in #1576

* Shim RCTPixelValue to take scale factor

* Remove extra semicolon

* Fix macOS tags

Co-authored-by: Shawn Dempsey <shawndempsey@fb.com>
shwanton added a commit to shwanton/react-native-macos that referenced this pull request Feb 13, 2023
* Shim RCTUILabel

* Conditionally ignore UIKit apis for UILabel

* Shim the RCTLabel to render correctly

* Re-add removed code

Co-authored-by: Shawn Dempsey <shawndempsey@fb.com>
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 Feb 13, 2023
* Fix RCTUISwitch definition removed in microsoft#1576

* Shim RCTPixelValue to take scale factor

* Remove extra semicolon

* Fix macOS tags

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
* Shim RCTUILabel

* Conditionally ignore UIKit apis for UILabel

* Shim the RCTLabel to render correctly

* Re-add removed code

Co-authored-by: Shawn Dempsey <shawndempsey@fb.com>
# Conflicts:
#	React/Base/macOS/RCTUIKit.m

# Conflicts:
#	React/Base/macOS/RCTUIKit.m
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
* Fix RCTUISwitch definition removed in microsoft#1576

* Shim RCTPixelValue to take scale factor

* Remove extra semicolon

* Fix macOS tags

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
* Shim RCTUILabel

* Conditionally ignore UIKit apis for UILabel

* Shim the RCTLabel to render correctly

* Re-add removed code

Co-authored-by: Shawn Dempsey <shawndempsey@fb.com>
# Conflicts:
#	React/Base/macOS/RCTUIKit.m

# Conflicts:
#	React/Base/macOS/RCTUIKit.m
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
* Fix RCTUISwitch definition removed in microsoft#1576

* Shim RCTPixelValue to take scale factor

* Remove extra semicolon

* Fix macOS tags

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
None yet
Development

Successfully merging this pull request may close these issues.

Introduce RCTUILabel and replace UILabel
3 participants