Skip to content

Scale loading bar text when island is super small #14680

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 2 commits into from
May 19, 2025
Merged

Scale loading bar text when island is super small #14680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db2f411
Scale loading bar text when island is super small
acoates-ms May 15, 2025
f060238
Change files
acoates-ms May 15, 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-ffcbc2ee-7f53-4f81-b199-38248cc85503.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Scale loading bar text when island is super small",
"packageName": "react-native-windows",
"email": "30809111+acoates-ms@users.noreply.github.com",
"dependentChangeType": "patch"
}
13 changes: 11 additions & 2 deletions vnext/Microsoft.ReactNative/Fabric/Composition/ReactNativeIsland.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ constexpr float loadingActivitySize = 12.0f;
constexpr float loadingActivityHorizontalOffset = 16.0f;
constexpr float loadingBarHeight = 36.0f;
constexpr float loadingBarFontSize = 20.0f;
constexpr float loadingBarMinFontSize = 8.0f;
constexpr float loadingTextHorizontalOffset = 48.0f;

//! This class ensures that we access ReactRootView from UI thread.
Expand Down Expand Up @@ -611,6 +612,14 @@ facebook::react::AttributedStringBox CreateLoadingAttributedString() noexcept {
return facebook::react::AttributedStringBox{attributedString};
}

facebook::react::ParagraphAttributes CreateLoadingParagraphAttributes() noexcept {
facebook::react::ParagraphAttributes pa;
pa.adjustsFontSizeToFit = true;
pa.minimumFontSize = loadingBarMinFontSize;
pa.maximumFontSize = loadingBarFontSize;
return pa;
}

facebook::react::Size ReactNativeIsland::MeasureLoading(
const winrt::Microsoft::ReactNative::LayoutConstraints &layoutConstraints) const noexcept {
facebook::react::LayoutConstraints fbLayoutConstraints;
Expand All @@ -619,7 +628,7 @@ facebook::react::Size ReactNativeIsland::MeasureLoading(
auto attributedStringBox = CreateLoadingAttributedString();
winrt::com_ptr<::IDWriteTextLayout> textLayout;
facebook::react::TextLayoutManager::GetTextLayout(
attributedStringBox, {} /*paragraphAttributes*/, fbLayoutConstraints, textLayout);
attributedStringBox, CreateLoadingParagraphAttributes(), fbLayoutConstraints, textLayout);

DWRITE_TEXT_METRICS tm;
winrt::check_hresult(textLayout->GetMetrics(&tm));
Expand Down Expand Up @@ -701,7 +710,7 @@ Composition::Experimental::IDrawingSurfaceBrush ReactNativeIsland::CreateLoading

winrt::com_ptr<::IDWriteTextLayout> textLayout;
facebook::react::TextLayoutManager::GetTextLayout(
attributedStringBox, {} /*paragraphAttributes*/, constraints, textLayout);
attributedStringBox, CreateLoadingParagraphAttributes(), constraints, textLayout);

DWRITE_TEXT_METRICS tm;
textLayout->GetMetrics(&tm);
Expand Down