Skip to content

Fix text layout cache key for maxFontSizeMultiplier #56960

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

Open
KirtiRamchandani wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −5
Open

Fix text layout cache key for maxFontSizeMultiplier #56960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ inline bool areTextAttributesEquivalentLayoutWise(const TextAttributes &lhs, con
lhs.fontStyle,
lhs.fontVariant,
lhs.allowFontScaling,
lhs.maxFontSizeMultiplier,
lhs.dynamicTypeRamp,
lhs.alignment) ==
std::tie(
Expand All @@ -127,6 +128,7 @@ inline bool areTextAttributesEquivalentLayoutWise(const TextAttributes &lhs, con
rhs.fontStyle,
rhs.fontVariant,
rhs.allowFontScaling,
rhs.maxFontSizeMultiplier,
rhs.dynamicTypeRamp,
rhs.alignment) &&
floatEquality(lhs.fontSize, rhs.fontSize) && floatEquality(lhs.fontSizeMultiplier, rhs.fontSizeMultiplier) &&
Expand All @@ -145,6 +147,7 @@ inline size_t textAttributesHashLayoutWise(const TextAttributes &textAttributes)
textAttributes.fontStyle,
textAttributes.fontVariant,
textAttributes.allowFontScaling,
textAttributes.maxFontSizeMultiplier,
textAttributes.dynamicTypeRamp,
textAttributes.letterSpacing,
textAttributes.lineHeight,
Expand Down
29 changes: 24 additions & 5 deletions ...react-native/ReactCommon/react/renderer/textlayoutmanager/tests/TextLayoutManagerTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,33 @@
* LICENSE file in the root directory of this source tree.
*/

#include <memory>

#include <gtest/gtest.h>

#include <react/renderer/textlayoutmanager/TextLayoutManager.h>
#include <react/renderer/textlayoutmanager/TextMeasureCache.h>

using namespace facebook::react;

TEST(TextLayoutManagerTest, testSomething) {
// TODO:
TEST(TextLayoutManagerTest, maxFontSizeMultiplierAffectsLayoutCacheEquality) {
TextAttributes lhs;
TextAttributes rhs;

lhs.fontSize = rhs.fontSize = 16;
lhs.fontSizeMultiplier = rhs.fontSizeMultiplier = 2;
lhs.maxFontSizeMultiplier = 1;
rhs.maxFontSizeMultiplier = 2;

EXPECT_FALSE(areTextAttributesEquivalentLayoutWise(lhs, rhs));
}

TEST(TextLayoutManagerTest, maxFontSizeMultiplierAffectsLayoutCacheHash) {
TextAttributes lhs;
TextAttributes rhs;

lhs.fontSize = rhs.fontSize = 16;
lhs.fontSizeMultiplier = rhs.fontSizeMultiplier = 2;
lhs.maxFontSizeMultiplier = 1;
rhs.maxFontSizeMultiplier = 2;

EXPECT_NE(
textAttributesHashLayoutWise(lhs), textAttributesHashLayoutWise(rhs));
}
Loading