Skip to content

Commit 6408a25

Browse files
committed
Apply letter spacing span after font size on Android
1 parent b1e97a1 commit 6408a25

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,14 @@ private static void buildSpannedFromShadowNode(
119119
new SetSpanOperation(
120120
start, end, new BackgroundColorSpan(textShadowNode.mBackgroundColor)));
121121
}
122+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
123+
if (textShadowNode.mLetterSpacing != Float.NaN) {
124+
ops.add(new SetSpanOperation(
125+
start,
126+
end,
127+
new CustomLetterSpacingSpan(textShadowNode.mLetterSpacing)));
128+
}
129+
}
122130
if (textShadowNode.mFontSize != UNSET) {
123131
ops.add(new SetSpanOperation(start, end, new AbsoluteSizeSpan(textShadowNode.mFontSize)));
124132
}
@@ -157,14 +165,6 @@ private static void buildSpannedFromShadowNode(
157165
new SetSpanOperation(
158166
start, end, new CustomLineHeightSpan(textShadowNode.getEffectiveLineHeight())));
159167
}
160-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
161-
if (textShadowNode.mLetterSpacing != Float.NaN) {
162-
ops.add(new SetSpanOperation(
163-
start,
164-
end,
165-
new CustomLetterSpacingSpan(textShadowNode.mLetterSpacing)));
166-
}
167-
}
168168
ops.add(new SetSpanOperation(start, end, new ReactTagSpan(textShadowNode.getReactTag())));
169169
}
170170
}

0 commit comments

Comments
 (0)