Skip to content

[Fabric] Implement maxFontSizeMultiplier in Text Input #14639

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.

Sign up for GitHub

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
Jun 30, 2025
Merged

[Fabric] Implement maxFontSizeMultiplier in Text Input #14639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5ec4be1
[Fabric] Implement maxFontSizeMultiplier in Text Input
anupriya13 May 6, 2025
2e026c2
Change files
anupriya13 May 6, 2025
90e972c
Merge branch 'main' into user/anuverma/textinputmaxfontsize
anupriya13 May 14, 2025
4ab9dc1
Update files as per latest integration
anupriya13 May 14, 2025
50310f0
Merge branch 'main' into user/anuverma/textinputmaxfontsize
jonthysell May 15, 2025
612d56c
Merge branch 'main' into user/anuverma/textinputmaxfontsize
anupriya13 May 22, 2025
1a80ce8
Merge branch 'main' into user/anuverma/textinputmaxfontsize
anupriya13 Jun 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions change/react-native-windows-595c068c-640d-4645-a3e4-d6d23bf99c79.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "[Fabric] Implement maxFontSizeMultiplier in Text Input",
"packageName": "react-native-windows",
"email": "[email protected]",
"dependentChangeType": "patch"
}
13 changes: 11 additions & 2 deletions vnext/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1062,7 +1062,10 @@ void WindowsTextInputComponentView::updateProps(
oldTextInputProps.textAttributes.fontWeight != newTextInputProps.textAttributes.fontWeight ||
!facebook::react::floatEquality(
oldTextInputProps.textAttributes.letterSpacing, newTextInputProps.textAttributes.letterSpacing) ||
oldTextInputProps.textAttributes.fontFamily != newTextInputProps.textAttributes.fontFamily) {
oldTextInputProps.textAttributes.fontFamily != newTextInputProps.textAttributes.fontFamily ||
!facebook::react::floatEquality(
oldTextInputProps.textAttributes.maxFontSizeMultiplier,
newTextInputProps.textAttributes.maxFontSizeMultiplier)) {
m_propBitsMask |= TXTBIT_CHARFORMATCHANGE;
m_propBits |= TXTBIT_CHARFORMATCHANGE;
}
Expand Down Expand Up @@ -1422,9 +1425,15 @@ void WindowsTextInputComponentView::UpdateCharFormat() noexcept {

// set font size -- 15 to convert twips to pt
const auto &props = windowsTextInputProps();
float fontSize = m_fontSizeMultiplier *
float fontSize =
(std::isnan(props.textAttributes.fontSize) ? facebook::react::TextAttributes::defaultTextAttributes().fontSize
: props.textAttributes.fontSize);

// Apply maxFontSizeMultiplier if specified
auto maxFontSizeMultiplier = windowsTextInputProps().textAttributes.maxFontSizeMultiplier;
fontSize *=
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This presumably changes the size that the text actually renders with. Is this accounted for in the layout? -- Basically I think TextLayoutManager needs to also account for this property to correctly calculate the layout of this text.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh i see. Thats part of the other PR.
Dont we need to get the font size from the layout? How do we get get the actual font size that the layout determined was appropriate?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With Text we reuse the same TextLayout object that was modified by TextLayoutManager. For TextInput, I think we'd have to extract the size that was calculated from the TextLayout (or otherwise get it from the TextLayoutManager), so that we can set it on the CHARFORMAT?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I referred to Android / IOS implementations. Let me get back on this tomorrow.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@acoates-ms https://github.com/microsoft/react-native-windows/blob/50310f0d76f31dceed0ebb79cf7bfd9e8f8baa1a/vnext/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.cpp#L1485C39-L1485C59

Refer this line for fontSize and m_fontSizeMultiplier assignment. Do you still think any change is required here for this PR?

(maxFontSizeMultiplier >= 1.0f) ? std::min(maxFontSizeMultiplier, m_fontSizeMultiplier) : m_fontSizeMultiplier;

// TODO get fontSize from props.textAttributes, or defaultTextAttributes, or fragment?
cfNew.dwMask |= CFM_SIZE;
cfNew.yHeight = static_cast<LONG>(fontSize * 15);
Expand Down
Loading