Skip to content

Commit

Permalink
Fix android
Browse files Browse the repository at this point in the history
  • Loading branch information
@janicduplessis
janicduplessis committed Jun 19, 2024
1 parent 11e8411 commit f0637c2
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 36 deletions.
4 changes: 2 additions & 2 deletions packages/react-native/ReactAndroid/api/ReactAndroid.api
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7390,7 +7390,7 @@ public class com/facebook/react/views/text/ReactTextView : androidx/appcompat/wi
public fun setIncludeFontPadding (Z)V
public fun setLetterSpacing (F)V
public fun setLinkifyMask (I)V
public fun setMinimumFontSize (F)V
public fun setMinimumFontScale (F)V
public fun setNotifyOnInlineViewLayout (Z)V
public fun setNumberOfLines (I)V
public fun setOverflow (Ljava/lang/String;)V
Expand Down Expand Up @@ -7606,7 +7606,7 @@ public class com/facebook/react/views/text/TextLayoutManager {
public static final field PA_KEY_INCLUDE_FONT_PADDING S
public static final field PA_KEY_MAXIMUM_FONT_SIZE S
public static final field PA_KEY_MAX_NUMBER_OF_LINES S
public static final field PA_KEY_MINIMUM_FONT_SIZE S
public static final field PA_KEY_MINIMUM_FONT_SCALE S
public static final field PA_KEY_TEXT_BREAK_STRATEGY S
public fun <init> ()V
public static fun adjustSpannableFontToFit (Landroid/text/Spannable;FLcom/facebook/yoga/YogaMeasureMode;FLcom/facebook/yoga/YogaMeasureMode;DIZIILandroid/text/Layout$Alignment;)V
Expand Down
10 changes: 5 additions & 5 deletions .../react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
private TextUtils.TruncateAt mEllipsizeLocation;
private boolean mAdjustsFontSizeToFit;
private float mFontSize;
private float mMinimumFontSize;
private float mMinimumFontScale;
private float mLetterSpacing;
private int mLinkifyMaskType;
private boolean mNotifyOnInlineViewLayout;
Expand Down Expand Up @@ -99,7 +99,7 @@ private void initView() {
mShouldAdjustSpannableFontSize = false;
mEllipsizeLocation = TextUtils.TruncateAt.END;
mFontSize = Float.NaN;
mMinimumFontSize = Float.NaN;
mMinimumFontScale = 0.f;
mLetterSpacing = 0.f;

mSpanned = null;
Expand Down Expand Up @@ -371,7 +371,7 @@ protected void onDraw(Canvas canvas) {
YogaMeasureMode.EXACTLY,
getHeight(),
YogaMeasureMode.EXACTLY,
mMinimumFontSize,
mMinimumFontScale,
mNumberOfLines,
getIncludeFontPadding(),
getBreakStrategy(),
Expand Down Expand Up @@ -623,8 +623,8 @@ public void setFontSize(float fontSize) {
applyTextAttributes();
}

public void setMinimumFontSize(float minimumFontSize) {
mMinimumFontSize = minimumFontSize;
public void setMinimumFontScale(float minimumFontScale) {
mMinimumFontScale = minimumFontScale;
mShouldAdjustSpannableFontSize = true;
}

Expand Down
8 changes: 4 additions & 4 deletions ...native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,11 @@ private Object getReactTextUpdate(ReactTextView view, ReactStylesDiffMap props,
view.setSpanned(spanned);

try {
float minimumFontSize =
(float) paragraphAttributes.getDouble(TextLayoutManager.PA_KEY_MINIMUM_FONT_SIZE);
view.setMinimumFontSize(minimumFontSize);
float minimumFontScale =
(float) paragraphAttributes.getDouble(TextLayoutManager.PA_KEY_MINIMUM_FONT_SCALE);
view.setMinimumFontScale(minimumFontScale);
} catch (IllegalArgumentException e) {
// T190482857: We see rare crash with MapBuffer without PA_KEY_MINIMUM_FONT_SIZE entry
// T190482857: We see rare crash with MapBuffer without PA_KEY_MINIMUM_FONT_SCALE entry
FLog.e(
TAG,
"Paragraph Attributes: %s",
Expand Down
36 changes: 16 additions & 20 deletions ...ct-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@ public class TextLayoutManager {
public static final short PA_KEY_ADJUST_FONT_SIZE_TO_FIT = 3;
public static final short PA_KEY_INCLUDE_FONT_PADDING = 4;
public static final short PA_KEY_HYPHENATION_FREQUENCY = 5;
public static final short PA_KEY_MINIMUM_FONT_SIZE = 6;
public static final short PA_KEY_MAXIMUM_FONT_SIZE = 7;
public static final short PA_KEY_MINIMUM_FONT_SCALE = 6;

private static final boolean ENABLE_MEASURE_LOGGING = ReactBuildConfig.DEBUG && false;

Expand Down Expand Up @@ -428,7 +427,7 @@ public static void adjustSpannableFontToFit(
YogaMeasureMode widthYogaMeasureMode,
float height,
YogaMeasureMode heightYogaMeasureMode,
double minimumFontSizeAttr,
double minimumFontScaleAttr,
int maximumNumberOfLines,
boolean includeFontPadding,
int textBreakStrategy,
Expand All @@ -446,18 +445,15 @@ public static void adjustSpannableFontToFit(
hyphenationFrequency,
alignment);

// Minimum font size is 4pts to match the iOS implementation.
int minimumFontSize =
(int)
(Double.isNaN(minimumFontSizeAttr) ? PixelUtil.toPixelFromDIP(4) : minimumFontSizeAttr);

// Find the largest font size used in the spannable to use as a starting point.
int currentFontSize = minimumFontSize;
// Find the largest font size used in the spanable to use as a starting point.
int currentFontSize = 0;
ReactAbsoluteSizeSpan[] spans = text.getSpans(0, text.length(), ReactAbsoluteSizeSpan.class);
for (ReactAbsoluteSizeSpan span : spans) {
currentFontSize = Math.max(currentFontSize, span.getSize());
}

// Minimum font size is 4pts to match the iOS implementation.
int minimumFontSize = (int) Math.max(minimumFontScaleAttr * currentFontSize, PixelUtil.toPixelFromDIP(4));
int initialFontSize = currentFontSize;
while (currentFontSize > minimumFontSize
&& ((maximumNumberOfLines != ReactConstants.UNSET
Expand Down Expand Up @@ -534,18 +530,18 @@ public static long measureText(
Layout.Alignment alignment = getTextAlignment(attributedString, text);

if (adjustFontSizeToFit) {
double minimumFontSize =
paragraphAttributes.contains(PA_KEY_MINIMUM_FONT_SIZE)
? paragraphAttributes.getDouble(PA_KEY_MINIMUM_FONT_SIZE)
: Double.NaN;
double minimumFontScale =
paragraphAttributes.contains(PA_KEY_MINIMUM_FONT_SCALE)
? paragraphAttributes.getDouble(PA_KEY_MINIMUM_FONT_SCALE)
: 0.0;

adjustSpannableFontToFit(
text,
width,
widthYogaMeasureMode,
height,
heightYogaMeasureMode,
minimumFontSize,
minimumFontScale,
maximumNumberOfLines,
includeFontPadding,
textBreakStrategy,
Expand Down Expand Up @@ -743,18 +739,18 @@ public static WritableArray measureLines(
Layout.Alignment alignment = getTextAlignment(attributedString, text);

if (adjustFontSizeToFit) {
double minimumFontSize =
paragraphAttributes.contains(PA_KEY_MINIMUM_FONT_SIZE)
? paragraphAttributes.getDouble(PA_KEY_MINIMUM_FONT_SIZE)
: Double.NaN;
double minimumFontScale =
paragraphAttributes.contains(PA_KEY_MINIMUM_FONT_SCALE)
? paragraphAttributes.getDouble(PA_KEY_MINIMUM_FONT_SCALE)
: 0.0;

adjustSpannableFontToFit(
text,
width,
YogaMeasureMode.EXACTLY,
height,
YogaMeasureMode.UNDEFINED,
minimumFontSize,
minimumFontScale,
maximumNumberOfLines,
includeFontPadding,
textBreakStrategy,
Expand Down
7 changes: 2 additions & 5 deletions packages/react-native/ReactCommon/react/renderer/attributedstring/conversions.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -858,8 +858,7 @@ constexpr static MapBuffer::Key PA_KEY_TEXT_BREAK_STRATEGY = 2;
constexpr static MapBuffer::Key PA_KEY_ADJUST_FONT_SIZE_TO_FIT = 3;
constexpr static MapBuffer::Key PA_KEY_INCLUDE_FONT_PADDING = 4;
constexpr static MapBuffer::Key PA_KEY_HYPHENATION_FREQUENCY = 5;
constexpr static MapBuffer::Key PA_KEY_MINIMUM_FONT_SIZE = 6;
constexpr static MapBuffer::Key PA_KEY_MAXIMUM_FONT_SIZE = 7;
constexpr static MapBuffer::Key PA_KEY_MINIMUM_FONT_SCALE = 6;

inline MapBuffer toMapBuffer(const ParagraphAttributes& paragraphAttributes) {
auto builder = MapBufferBuilder();
Expand All @@ -878,9 +877,7 @@ inline MapBuffer toMapBuffer(const ParagraphAttributes& paragraphAttributes) {
PA_KEY_HYPHENATION_FREQUENCY,
toString(paragraphAttributes.android_hyphenationFrequency));
builder.putDouble(
PA_KEY_MINIMUM_FONT_SIZE, paragraphAttributes.minimumFontSize);
builder.putDouble(
PA_KEY_MAXIMUM_FONT_SIZE, paragraphAttributes.maximumFontSize);
PA_KEY_MINIMUM_FONT_SCALE, paragraphAttributes.minimumFontScale);

return builder.build();
}
Expand Down

0 comments on commit f0637c2

Please sign in to comment.