Skip to content
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

[Fabric] Fix wrong text offset when a line height is set. #1819

Merged
merged 1 commit into from
May 8, 2023

Conversation

lenaic
Copy link

@lenaic lenaic commented May 7, 2023

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

This change adds back a working maximum font line height calculation method for macOS on fabric by using the common UIFontLineHeight method that works for UIKit and AppKit. This is required for the correct calculation of the baseline offset for text having a line height greater than the text's font height.

Changelog

[macOS] [FIXED] - Fixed the vertical text position in Fabric when setting a line height

Test Plan

Tested by running RNTester on macOS with paper and fabric (RCT_NEW_ARCH_ENABLED=1) and launching the TextInput example. As a regression test for iOS, the RNTester app was tested on iOS with fabric.

Without the fix on Fabric (text is too high and clipped by the view):
Screenshot 2023-05-08 at 01 32 40

With the fix on Fabric:
Screenshot 2023-05-08 at 01 27 57

With the fix on Paper:
Screenshot 2023-05-08 at 01 30 42

With the fix on Fabric iOS:
Screenshot 2023-05-08 at 01 29 17

@lenaic lenaic requested a review from a team as a code owner May 7, 2023 23:44
@Saadnajmi Saadnajmi merged commit 4b8a987 into microsoft:main May 8, 2023
@lenaic lenaic deleted the fabric/fix-offsetted-text branch May 8, 2023 13:30
lenaic added a commit to lenaic/react-native-macos that referenced this pull request Aug 7, 2023
Saadnajmi pushed a commit that referenced this pull request Aug 7, 2023
* [Fabric] Return active touch identifiers in surface touch handler on mouse up. (#1815)

Co-authored-by: Nick <lefever@meta.com>

* [Fabric] Add mandatory color space conversion for macOS. (#1813)

Co-authored-by: Nick <lefever@meta.com>

* [Fabric] Clean up hit testing now that RCTUIView extends RCTPlatformView (#1814)

* Clean up surface touch handler now that RCTUIView extends RCTPlatformView.

* Fix the iOS build.

---------

Co-authored-by: Nick <lefever@meta.com>

* [Fabric] Use the layout metrics to get the scale factor in component views. (#1816)

* Use the layout metrics to get the scale factor in component views.

* Use layout metrics pointScaleFactor instead of RCTScreenScale on iOS.

---------

Co-authored-by: Nick <lefever@meta.com>

* Fix RNTester content not resizing with window. (#1818)

Co-authored-by: Nick <lefever@meta.com>

* Fix wrong text offset when a line height is set. (#1819)

Co-authored-by: Nick <lefever@meta.com>

* [Fabric] Fix scroll views hiding content underneath them in Fabric. (#1820)

* Fix scroll views hiding content underneath them in Fabric.

* Clean up Paper scroll view after shim scroll view fix.

---------

Co-authored-by: Nick <lefever@meta.com>

* [Fabric] Add support for image content mode and tint features (#1828)

* Add RCTUIImageView to RCTUIKit to support iOS features on macOS.

* Add support for tint and resize mode to Image on Fabric.

* Clean up logging and add macOS tag.

* Fix code style to match the style guide.

---------

Co-authored-by: Nick <lefever@meta.com>

* [Fabric] Fix text input rendering crashing by using layout metrics pixelScaleFactor (#1817)

* Use layout metrics to assign the active scale factor to RCTUITextField.

* Use layout metrics to assign the active scale factor to RCTUITextView.

---------

Co-authored-by: Nick <lefever@meta.com>

* [Fabric] Tint images using CIFilter fixing wrong tinted image size (#1843)

* Tint images using CIFilter to fix wrong image size when enabling tinting.

* Initialize the CIFilter input values with default values.

---------

Co-authored-by: Nick <lefever@meta.com>

---------

Co-authored-by: Nick <lefever@meta.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.

2 participants